# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1271022208 25200
# Node ID 92451fdcc718ceeafdf7ba02e282adb65fa46167
# Parent  3879f5eab4e9ea7a6d89745a23f8b84d30d92840
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 -r 3879f5eab4e9 -r 92451fdcc718 src/ChangeLog
--- a/src/ChangeLog	Sun Apr 11 13:17:24 2010 -0700
+++ b/src/ChangeLog	Sun Apr 11 14:43:28 2010 -0700
@@ -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 -r 3879f5eab4e9 -r 92451fdcc718 src/Makefile.in
--- a/src/Makefile.in	Sun Apr 11 13:17:24 2010 -0700
+++ b/src/Makefile.in	Sun Apr 11 14:43:28 2010 -0700
@@ -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
diff -r 3879f5eab4e9 -r 92451fdcc718 src/s/darwin.h
--- a/src/s/darwin.h	Sun Apr 11 13:17:24 2010 -0700
+++ b/src/s/darwin.h	Sun Apr 11 14:43:28 2010 -0700
@@ -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