aboutsummaryrefslogtreecommitdiff
path: root/cyclone
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2013-01-22 17:31:49 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2013-01-22 17:31:49 +0000
commit469238676dd466a55b3808461e262f5645f888d1 (patch)
tree97c9e3f508baf64ff204fb99cd12a625231c259c /cyclone
parent886e1012372ea48f4946f40ad9dee577389b76f2 (diff)
use HAVE_UNISTD_H to determine when to include unistd.h
svn path=/trunk/externals/miXed/; revision=16960
Diffstat (limited to 'cyclone')
-rw-r--r--cyclone/Makefile.libdir10
-rw-r--r--cyclone/shadow/dummies.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/cyclone/Makefile.libdir b/cyclone/Makefile.libdir
index 920c080..9b6d756 100644
--- a/cyclone/Makefile.libdir
+++ b/cyclone/Makefile.libdir
@@ -41,7 +41,7 @@ ifeq ($(UNAME),Darwin)
else
FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4
endif
- CFLAGS += -DUNIX $(FAT_FLAGS) -fPIC -I/sw/include
+ CFLAGS += -DUNIX -DHAVE_UNISTD_H $(FAT_FLAGS) -fPIC -I/sw/include
LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup -L/sw/lib
# if the 'pd' binary exists, check the linking against it to aid with stripping
LDFLAGS += $(shell test -e $(PD_PATH)/bin/pd && echo -bundle_loader $(PD_PATH)/bin/pd)
@@ -57,7 +57,7 @@ ifeq ($(UNAME),Linux)
OS = linux
PD_PATH = /usr
OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
- CFLAGS += -DUNIX -fPIC
+ CFLAGS += -DUNIX -DHAVE_UNISTD_H -fPIC
LDFLAGS += -rdynamic -shared -fPIC
LIBS += -lc
STRIP = strip --strip-unneeded -R .note -R .comment
@@ -69,7 +69,7 @@ ifeq ($(UNAME),GNU)
OS = linux
PD_PATH = /usr
OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
- CFLAGS += -DUNIX -fPIC
+ CFLAGS += -DUNIX -DHAVE_UNISTD_H -fPIC
LDFLAGS += -rdynamic -shared -fPIC
LIBS += -lc
STRIP = strip --strip-unneeded -R .note -R .comment
@@ -81,7 +81,7 @@ ifeq ($(UNAME),GNU/kFreeBSD)
OS = linux
PD_PATH = /usr
OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
- CFLAGS += -DUNIX -fPIC
+ CFLAGS += -DUNIX -DHAVE_UNISTD_H -fPIC
LDFLAGS += -rdynamic -shared -fPIC
LIBS += -lc
STRIP = strip --strip-unneeded -R .note -R .comment
@@ -93,7 +93,7 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
OS = cygwin
PD_PATH = $(cygpath $(PROGRAMFILES))/pd
OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
- CFLAGS += -DUNIX
+ CFLAGS += -DUNIX -DHAVE_UNISTD_H
LDFLAGS += -Wl,--export-dynamic -shared -L"$(PD_PATH)/src" -L"$(PD_PATH)/bin"
LIBS += -lc -lpd
STRIP = strip --strip-unneeded -R .note -R .comment
diff --git a/cyclone/shadow/dummies.c b/cyclone/shadow/dummies.c
index 18ce3e8..1d18753 100644
--- a/cyclone/shadow/dummies.c
+++ b/cyclone/shadow/dummies.c
@@ -3,7 +3,7 @@
* WARRANTIES, see the file, "LICENSE.txt," in this distribution. */
#include <string.h>
-#ifdef UNIX
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef _WIN32