From 82fcf234d087486e385ef644c80a5d247896d5bc Mon Sep 17 00:00:00 2001 From: John-Mark Bell Date: Sun, 16 Nov 2014 10:31:59 +0000 Subject: Fix up for new buildsystem. Remove unused compat hacks. --- Makefile | 4 ++-- src/utils/utils.h | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 4ec03f3..eb459a1 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,8 @@ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \ -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \ -Wmissing-declarations -Wnested-externs -pedantic # BeOS/Haiku/AmigaOS have standard library errors that issue warnings. -ifneq ($(TARGET),beos) - ifneq ($(TARGET),amiga) +ifneq ($(BUILD),i586-pc-haiku) + ifneq ($(findstring amigaos,$(BUILD)),amigaos) WARNFLAGS := $(WARNFLAGS) -Werror endif endif diff --git a/src/utils/utils.h b/src/utils/utils.h index e949bd1..d22a0eb 100644 --- a/src/utils/utils.h +++ b/src/utils/utils.h @@ -8,19 +8,6 @@ #ifndef hubbub_utils_h_ #define hubbub_utils_h_ -#ifdef BUILD_TARGET_riscos - /* If we're building with Norcroft, then we need to haul in - * unixlib.h from TCPIPLibs for useful things like strncasecmp - */ - #ifdef __CC_NORCROFT - #include - #endif -#endif - -#ifdef BUILD_TARGET_windows - #define strncasecmp _strnicmp -#endif - #ifndef max #define max(a,b) ((a)>(b)?(a):(b)) #endif -- cgit v1.2.3