GCC Wallification

This commit is contained in:
Scott Ehlert
2006-08-27 02:17:18 +00:00
parent 6786b0e356
commit 81ac41037b
41 changed files with 486 additions and 431 deletions

View File

@ -28,6 +28,7 @@
#ifndef _WIN32
#include <netdb.h>
#include <netinet/in.h> /* For ntohl */
#include <arpa/inet.h>
#else
#include <windows.h>
#endif
@ -649,7 +650,7 @@ char *_get_name (GeoIP* gi, unsigned long ipnum) {
org_buf = malloc(sizeof(char) * (strlen(buf)+1));
strcpy(org_buf, buf);
} else {
buf_pointer = gi->cache + (long)record_pointer;
buf_pointer = (char *)gi->cache + (long)record_pointer;
org_buf = malloc(sizeof(char) * (strlen(buf_pointer)+1));
strcpy(org_buf, buf_pointer);
}

View File

@ -35,7 +35,10 @@ else
CFLAGS = $(OPT_FLAGS)
endif
CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti
CFLAGS += -DNDEBUG -fPIC -Wall -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti
# Strip C++ options for compiling *.c files
C_CFLAGS := $(shell echo $(CFLAGS) | sed -e 's/-fvisibility-inlines-hidden//' | sed -e 's/-fno-rtti//')
ifeq "$(AMD64)" "true"
BINARY = $(NAME)_$(BIN_SUFFIX_64)
@ -47,19 +50,23 @@ else
endif
OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
OBJ_LINUX := $(OBJ_LINUX:%.c=$(BIN_DIR)/%.o)
$(BIN_DIR)/%.o: %.cpp
$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
$(BIN_DIR)/%.o: %.c
$(CPP) $(INCLUDE) $(C_CFLAGS) -o $@ -c $<
all:
mkdir -p $(BIN_DIR)
mkdir -p $(BIN_DIR)/sdk
$(MAKE) geoip
amd64:
$(MAKE) all AMD64=true
geoip: $(OBJ_LINUX)
echo ZUMBAWUMBA $(OBJ_LINUX)
$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
debug:
@ -74,4 +81,4 @@ clean:
rm -rf Debug/*.o
rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32)
rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)