[Emacs-diffs] /srv/bzr/emacs/trunk r99875: Remove C_SWITCH_SYSTEM_TEMACS.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 99875
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Sun 2010-04-11 14:43:28 -0700
message:
  Remove C_SWITCH_SYSTEM_TEMACS.
  * s/darwin.h (C_SWITCH_SYSTEM_TEMACS): Remove.
  (malloc, realloc, free): Use emacs, not temacs for conditional
  definition.
  
  * Makefile.in (C_SWITCH_SYSTEM_TEMACS): Remove.
  (ALL_CFLAGS): Do not use C_SWITCH_SYSTEM_TEMACS.
modified:
  src/ChangeLog
  src/Makefile.in
  src/s/darwin.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-11 20:04:24 +0000
+++ b/src/ChangeLog     2010-04-11 21:43:28 +0000
@@ -1,5 +1,13 @@
 2010-04-11  Dan Nicolaescu  <address@hidden>
 
+       Remove C_SWITCH_SYSTEM_TEMACS.
+       * s/darwin.h (C_SWITCH_SYSTEM_TEMACS): Remove.
+       (malloc, realloc, free): Use emacs, not temacs for conditional
+       definition.
+
+       * Makefile.in (C_SWITCH_SYSTEM_TEMACS): Remove.
+       (ALL_CFLAGS): Do not use C_SWITCH_SYSTEM_TEMACS.
+
        Use autoconf, not cpp for some variables.
        * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
        (C_SWITCH_X_SITE): Define using autoconf, not cpp.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-04-11 20:04:24 +0000
+++ b/src/Makefile.in   2010-04-11 21:43:28 +0000
@@ -166,12 +166,6 @@
 #define LD_SWITCH_SYSTEM_TEMACS
 #endif
 
-/* Some s/SYSTEM.h files define this to request special switches
-   for compiling temacs.  */
-#ifndef C_SWITCH_SYSTEM_TEMACS
-#define C_SWITCH_SYSTEM_TEMACS
-#endif
-
 /* Some m/MACHINE.h files define this to request special switches in ld.  */
 #ifndef LD_SWITCH_MACHINE
 #define LD_SWITCH_MACHINE
@@ -258,7 +252,7 @@
 
 /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
    since it may have -I options that should override those two.  */
-ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} 
$(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) C_SWITCH_X_MACHINE 
C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} 
${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ 
@LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS}
+ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} 
$(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) C_SWITCH_X_MACHINE 
C_SWITCH_X_SYSTEM ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} 
${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ 
@M17N_FLT_CFLAGS@ ${DEPFLAGS}
 ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
 
 .SUFFIXES: .m

=== modified file 'src/s/darwin.h'
--- a/src/s/darwin.h    2010-03-30 02:47:23 +0000
+++ b/src/s/darwin.h    2010-04-11 21:43:28 +0000
@@ -165,9 +165,7 @@
    each); under Cocoa 31 commands are required.  */
 #define LD_SWITCH_SYSTEM_TEMACS -prebind LIBS_NSGUI -Xlinker -headerpad 
-Xlinker HEADERPAD_EXTRA
 
-#define C_SWITCH_SYSTEM_TEMACS -Dtemacs
-
-#ifdef temacs
+#ifdef emacs
 #define malloc unexec_malloc
 #define realloc unexec_realloc
 #define free unexec_free