aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile.in
diff options
context:
space:
mode:
authorGlenn Morris2010-05-13 20:36:40 -0700
committerGlenn Morris2010-05-13 20:36:40 -0700
commitfbc00890119ec27ceaf50a0969ee121bef22905a (patch)
tree64ac315734ffef94abcaa31c520dde36b501c7f4 /src/Makefile.in
parent97560d35b90e969ce663d2b2bd6ce039496f339d (diff)
downloademacs-fbc00890119ec27ceaf50a0969ee121bef22905a.tar.gz
emacs-fbc00890119ec27ceaf50a0969ee121bef22905a.zip
Move some undefs from src/Makefile.in to configure.
* configure.in (cpp_undefs): Add mktime, register, X11. * src/Makefile.in (mktime, X11, register): Move undefs to configure. * admin/CPP-DEFINES: Remove X11.
Diffstat (limited to 'src/Makefile.in')
-rw-r--r--src/Makefile.in17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 4d2481af924..3a0339a3f70 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -251,23 +251,6 @@ UNEXEC_OBJ = @unexec@
251DEPFLAGS = -MMD -MF deps/$*.d 251DEPFLAGS = -MMD -MF deps/$*.d
252#endif 252#endif
253 253
254/* Do not let the file name mktime.c get messed up. */
255#ifdef mktime
256#undef mktime
257#endif
258
259/* Use HAVE_X11 as an alias for X11 in this file
260 to avoid problems with X11 as a subdirectory name
261 in -I and other such options which pass through this file. */
262#ifdef X11
263#define HAVE_X11
264#undef X11
265#endif
266
267/* On some machines #define register is done in config;
268 do not let it interfere with this file. */
269#undef register
270
271/* If NS_IMPL_GNUSTEP, some definitions and includes are expanded here. */ 254/* If NS_IMPL_GNUSTEP, some definitions and includes are expanded here. */
272@NS_IMPL_GNUSTEP_INC@ 255@NS_IMPL_GNUSTEP_INC@
273 256