[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] concurrency-libtask b075dc7 04/10: malloc is redefined by
From: |
Philipp Stephani |
Subject: |
[Emacs-diffs] concurrency-libtask b075dc7 04/10: malloc is redefined by config.h |
Date: |
Wed, 26 Oct 2016 21:32:44 +0000 (UTC) |
branch: concurrency-libtask
commit b075dc7c00e154bfc3c92aca4f24db68997e8a21
Author: Philipp Stephani <address@hidden>
Commit: Philipp Stephani <address@hidden>
malloc is redefined by config.h
But we need to define emacs as preprocessor symbol, not just EMACS.
---
lib/libtask/taskimpl.h | 10 ----------
src/Makefile.in | 2 +-
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/lib/libtask/taskimpl.h b/lib/libtask/taskimpl.h
index 2b1dd8f..2b1e31c 100644
--- 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 aa2db11..3570316 100644
--- 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?).
- [Emacs-diffs] concurrency-libtask updated (6852791 -> 9d613e5), Philipp Stephani, 2016/10/26
- [Emacs-diffs] concurrency-libtask f6aa233 09/10: Revert change in fd_handler., Philipp Stephani, 2016/10/26
- [Emacs-diffs] concurrency-libtask b09d4ba 08/10: Fix format specifiers, Philipp Stephani, 2016/10/26
- [Emacs-diffs] concurrency-libtask 38b61be 06/10: Transfer signals to main coroutine, Philipp Stephani, 2016/10/26
- [Emacs-diffs] concurrency-libtask 0875d8d 05/10: Remove wrong assertion, Philipp Stephani, 2016/10/26
- [Emacs-diffs] concurrency-libtask b075dc7 04/10: malloc is redefined by config.h,
Philipp Stephani <=
- [Emacs-diffs] concurrency-libtask 3a1331b 01/10: Clarify the behavior of minor mode commands, Philipp Stephani, 2016/10/26
- [Emacs-diffs] concurrency-libtask 7be3718 07/10: Add missing defsubr, Philipp Stephani, 2016/10/26
- [Emacs-diffs] concurrency-libtask a856316 03/10: Support for Windows fibers, Philipp Stephani, 2016/10/26
- [Emacs-diffs] concurrency-libtask 9d613e5 10/10: Merge branch 'concurrency-libtask' of git.sv.gnu.org:/srv/git/emacs into concurrency-libtask, Philipp Stephani, 2016/10/26
- [Emacs-diffs] concurrency-libtask ee44c80 02/10: WIP: CSP based on libtask, Philipp Stephani, 2016/10/26