aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog3
-rw-r--r--src/s/gnu.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5846fbab92a..7e3372bc90d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12012-07-09 Glenn Morris <rgm@gnu.org> 12012-07-09 Glenn Morris <rgm@gnu.org>
2 2
3 * s/gnu.h (SIGNALS_VIA_CHARACTERS): No need to define it here,
4 since the included bsd-common.h does so.
5
3 Stop ns builds setting the EMACSPATH environment variable. 6 Stop ns builds setting the EMACSPATH environment variable.
4 * nsterm.m (ns_exec_path): New function, split from ns_init_paths. 7 * nsterm.m (ns_exec_path): New function, split from ns_init_paths.
5 (ns_init_paths): Do not set EMACSPATH. 8 (ns_init_paths): Do not set EMACSPATH.
diff --git a/src/s/gnu.h b/src/s/gnu.h
index c2bcf7fd9ab..a8e2c4cdbb8 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -21,8 +21,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
21/* Get most of the stuff from bsd-common */ 21/* Get most of the stuff from bsd-common */
22#include "bsd-common.h" 22#include "bsd-common.h"
23 23
24#define SIGNALS_VIA_CHARACTERS
25
26/* libc defines data_start. */ 24/* libc defines data_start. */
27#define DATA_START ({ extern int data_start; (char *) &data_start; }) 25#define DATA_START ({ extern int data_start; (char *) &data_start; })
28 26