aboutsummaryrefslogtreecommitdiffstats
path: root/src/s
diff options
context:
space:
mode:
authorDan Nicolaescu2010-04-11 14:43:28 -0700
committerDan Nicolaescu2010-04-11 14:43:28 -0700
commitb1f5216132ed2d54f5a41f5e68fbc374551f8d2e (patch)
tree5292acf61527fa333e885351d455ccb628da7c61 /src/s
parent76bd82023f5cc53d6ca40f33d87a10c26e5e9821 (diff)
downloademacs-b1f5216132ed2d54f5a41f5e68fbc374551f8d2e.tar.gz
emacs-b1f5216132ed2d54f5a41f5e68fbc374551f8d2e.zip
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.
Diffstat (limited to 'src/s')
-rw-r--r--src/s/darwin.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 8813127ffce..e8081c6dd25 100644
--- 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/>. */
165 each); under Cocoa 31 commands are required. */ 165 each); under Cocoa 31 commands are required. */
166#define LD_SWITCH_SYSTEM_TEMACS -prebind LIBS_NSGUI -Xlinker -headerpad -Xlinker HEADERPAD_EXTRA 166#define LD_SWITCH_SYSTEM_TEMACS -prebind LIBS_NSGUI -Xlinker -headerpad -Xlinker HEADERPAD_EXTRA
167 167
168#define C_SWITCH_SYSTEM_TEMACS -Dtemacs 168#ifdef emacs
169
170#ifdef temacs
171#define malloc unexec_malloc 169#define malloc unexec_malloc
172#define realloc unexec_realloc 170#define realloc unexec_realloc
173#define free unexec_free 171#define free unexec_free