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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3813ba047dd7d2fe42819a550af7e73df623f0b3..6f9642e606d83d80b706a7c7d5afff3d1329d6ae 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2010-04-11  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       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.

diff --git a/src/Makefile.in b/src/Makefile.in
index cc58ab5654cbe6c09930e49ec2ad921877bea241..d9ba6ffb9d144e0bd0325076003e6d8c1e5bd915 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -166,12 +166,6 @@ DEPFLAGS = -MMD -MF deps/$*.d
 #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 @@ GCONF_LIBS = @GCONF_LIBS@
 
 /* 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

diff --git a/src/s/darwin.h b/src/s/darwin.h
index 8813127ffce63387270346a0ad58c03f0112d365..e8081c6dd2598701e13937c50462eff3d0fd1c88 100644 (file)
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -165,9 +165,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    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