malloc is redefined by config.h

But we need to define emacs as preprocessor symbol, not just EMACS.

diff --git a/lib/libtask/taskimpl.h b/lib/libtask/taskimpl.h
index 2b1dd8f9f5e4d2fa949e343125b5480554f998ed..2b1e31cfc7b15713d422c467f33818b1a3232ea6 100644 (file)
--- a/lib/libtask/taskimpl.h
+++ b/lib/libtask/taskimpl.h
@@ -212,13 +212,3 @@ void       deltask(Tasklist*, Task*);
 
 extern Task    *taskrunning;
 extern int     taskcount;
-
-
-#ifdef EMACS
-#define malloc unexec_malloc
-#define realloc unexec_realloc
-#define free unexec_free
-void *unexec_malloc (size_t size);
-void *unexec_realloc (void *old_ptr, size_t new_size);
-void unexec_free (void *ptr);
-#endif

diff --git a/src/Makefile.in b/src/Makefile.in
index aa2db118d2c118f3cf00919a77d04a32f20c10de..35703160e2061cbbcbfb11251809e3661cef952e 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -611,7 +611,7 @@ libtask = \
 $(libtask): $(lib)/libtask/*.h
 
 $(lib)/libtask/%.o: $(lib)/libtask/%.c $(lib)/libtask/*.h lisp.h config.h globals.h
-       $(AM_V_CC)$(CC) -c -DEMACS -I. -I$(lib) $(CPPFLAGS) $(CFLAGS) -o $@ $<
+       $(AM_V_CC)$(CC) -c -DEMACS -Demacs -I. -I$(lib) $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 ## We have to create $(etc) here because init_cmdargs tests its
 ## existence when setting Vinstallation_directory (FIXME?).