zeekling/hiredis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only use C99 for compiling hiredis itself

Browse Source 
The libevent example cannot be compiled when -std=c99 is passed. It is
not necessary that the adapters nor the examples follow this standard,
as long as the code for hiredis itself is compliant.
This commit is contained in:
Pieter Noordhuis 2011-04-21 18:13:20 +02:00
parent eb63a565e9
commit 75bc8595c7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -8,7 +8,7 @@ BINS = hiredis-example hiredis-test
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
OPTIMIZATION?=-O3 OPTIMIZATION?=-O3
ifeq ($(uname_S),SunOS) ifeq ($(uname_S),SunOS)
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -D__EXTENSIONS__ -D_XPG6 $(ARCH) $(PROF) CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -D__EXTENSIONS__ -D_XPG6 $(ARCH) $(PROF)
CCLINK?=-ldl -lnsl -lsocket -lm -lpthread CCLINK?=-ldl -lnsl -lsocket -lm -lpthread
LDFLAGS?=-L. -Wl,-R,. LDFLAGS?=-L. -Wl,-R,.
DYLIBNAME?=libhiredis.so DYLIBNAME?=libhiredis.so
@ -17,7 +17,7 @@ ifeq ($(uname_S),SunOS)
STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ} STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
else else
ifeq ($(uname_S),Darwin) ifeq ($(uname_S),Darwin)
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF) CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
CCLINK?=-lm -pthread CCLINK?=-lm -pthread
LDFLAGS?=-L. -Wl,-rpath,. LDFLAGS?=-L. -Wl,-rpath,.
OBJARCH?=-arch i386 -arch x86_64 OBJARCH?=-arch i386 -arch x86_64
@ -26,7 +26,7 @@ ifeq ($(uname_S),Darwin)
STLIBNAME?=libhiredis.a STLIBNAME?=libhiredis.a
STLIB_MAKE_CMD?=libtool -static -o ${STLIBNAME} - ${OBJ} STLIB_MAKE_CMD?=libtool -static -o ${STLIBNAME} - ${OBJ}
else else
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF) CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
CCLINK?=-lm -pthread CCLINK?=-lm -pthread
LDFLAGS?=-L. -Wl,-rpath,. LDFLAGS?=-L. -Wl,-rpath,.
DYLIBNAME?=libhiredis.so DYLIBNAME?=libhiredis.so
@ -86,7 +86,7 @@ test: hiredis-test
./hiredis-test ./hiredis-test
.c.o: .c.o:
$(CC) -c $(CFLAGS) $(OBJARCH) $(DEBUG) $(COMPILE_TIME) $< $(CC) -std=c99 -pedantic -c $(CFLAGS) $(OBJARCH) $(DEBUG) $(COMPILE_TIME) $<
clean: clean:
rm -rf ${DYLIBNAME} ${STLIBNAME} $(BINS) hiredis-example* *.o *.gcda *.gcno *.gcov rm -rf ${DYLIBNAME} ${STLIBNAME} $(BINS) hiredis-example* *.o *.gcda *.gcno *.gcov