projects
/
fw
/
sdcc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Linker complaints if linked modules have conflicting options.
[fw/sdcc]
/
as
/
z80
/
aslist.c
diff --git
a/as/z80/aslist.c
b/as/z80/aslist.c
index 2c006cb3d1414cd37dc9ac36706f693c8da34573..e5344899bb1e25136cd79b5e87fb6ba5cfe41e65 100644
(file)
--- a/
as/z80/aslist.c
+++ b/
as/z80/aslist.c
@@
-16,12
+16,11
@@
#include <stdio.h>
#include <setjmp.h>
#include <string.h>
#include <stdio.h>
#include <setjmp.h>
#include <string.h>
-
-//#include "newalloc.h"
-#if defined(_MSC_VER)
-#include <malloc.h>
+#if defined(__APPLE__) && defined(__MACH__)
+#include <sys/types.h>
+#include <sys/malloc.h>
#else
#else
-#include <alloc.h>
+#include <
m
alloc.h>
#endif
#include "asm.h"
#endif
#include "asm.h"