aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2010-05-06 09:18:33 -0700
committerDan Nicolaescu2010-05-06 09:18:33 -0700
commitd43c06d68b82703ced7f2624245d8b45fd3c01fd (patch)
treea9fba4873c3f8b5699458f66b238bbe59ddf0f85
parent3e56b11d4a61af61b1af040a76abc842d89c8bf0 (diff)
downloademacs-d43c06d68b82703ced7f2624245d8b45fd3c01fd.tar.gz
emacs-d43c06d68b82703ced7f2624245d8b45fd3c01fd.zip
* Makefile.in (STARTFILES): Conditionally define to make the usage clear.
* s/gnu.h (START_FILES): Remove empty definition.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/Makefile.in5
-rw-r--r--src/s/gnu.h2
3 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 889c261f204..fca76174d33 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-05-06 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * Makefile.in (STARTFILES): Conditionally define to make the usage clear.
4 * s/gnu.h (START_FILES): Remove empty definition.
5
12010-05-06 Jan Djärv <jan.h.d@swipnet.se> 62010-05-06 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * xterm.c (x_draw_image_relief): Move declaration of extra to beginning. 8 * xterm.c (x_draw_image_relief): Move declaration of extra to beginning.
diff --git a/src/Makefile.in b/src/Makefile.in
index 08c205f0def..bd7b5a83585 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -212,8 +212,11 @@ DEPFLAGS = -MMD -MF deps/$*.d
212#define LD_SWITCH_X_SITE 212#define LD_SWITCH_X_SITE
213#endif 213#endif
214 214
215#ifdef START_FILES
215STARTFILES = START_FILES 216STARTFILES = START_FILES
216 217#else
218STARTFILES =
219#endif
217 220
218#ifdef NS_IMPL_GNUSTEP 221#ifdef NS_IMPL_GNUSTEP
219/* Pull in stuff from GNUstep-make. */ 222/* Pull in stuff from GNUstep-make. */
diff --git a/src/s/gnu.h b/src/s/gnu.h
index 946eaa6512b..bf68cabe051 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -44,8 +44,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
44#define ORDINARY_LINK 44#define ORDINARY_LINK
45#define DATA_START ({ extern int data_start; (char *) &data_start; }) 45#define DATA_START ({ extern int data_start; (char *) &data_start; })
46 46
47#define START_FILES
48
49/* Some losing code fails to include this and then assumes 47/* Some losing code fails to include this and then assumes
50 that because it is braindead that O_RDONLY==0. */ 48 that because it is braindead that O_RDONLY==0. */
51#ifndef NOT_C_CODE 49#ifndef NOT_C_CODE