diff --git a/GNUmakef.def b/GNUmakef.def index 6990f26..be3a317 100644 --- a/GNUmakef.def +++ b/GNUmakef.def @@ -42,7 +42,6 @@ WINDRES=windres EXEEXT=.exe OBJEXT=.o LIBEXT=.a -CFLAGS+=-funsigned-char else ifeq ($(PLATFORM),emx) CAT=cat @@ -64,7 +63,6 @@ LIBEXT=.a #OBJEXT=.obj #LIBEXT=.lib CXX=$(CC) -CFLAGS+=-funsigned-char else ifeq ($(PLATFORM),djg) CAT=command.com /c type @@ -78,7 +76,6 @@ SHELL=sh EXEEXT=.exe OBJEXT=.o LIBEXT=.a -CFLAGS+=-funsigned-char else ifeq ($(PLATFORM),be) CAT=cat @@ -91,7 +88,6 @@ RANLIB=ranlib EXEEXT= OBJEXT=.o LIBEXT=.a -CFLAGS+=-funsigned-char LNKFLAGS+=-lbe -ltextencoding else ifeq ($(PLATFORM),sun) # SUN Solaris @@ -105,7 +101,7 @@ RANLIB=ranlib EXEEXT= OBJEXT=.o LIBEXT=.a -CFLAGS+=-fsigned-char -D__SUNOS__ -D__UNIX__ -DUNIX +CFLAGS+=-D__SUNOS__ -D__UNIX__ -DUNIX else # Linux, *BSD or another unix-like OS CAT=cat SED=sed @@ -118,13 +114,12 @@ PLATFORM=lnx EXEEXT= OBJEXT=.o LIBEXT=.a -CFLAGS+=-funsigned-char endif endif endif endif endif -CFLAGS+=-g $(INCS) -Wall -Wno-sign-compare -pedantic -O2 -DPRAGMA_PACK # -fomit-frame-pointer +CFLAGS+=-funsigned-char -g $(INCS) -Wall -Wno-sign-compare -pedantic -O2 -DPRAGMA_PACK # -fomit-frame-pointer LNKFLAGS+=-g CPPFLAGS+=$(CFLAGS) -fno-rtti # -fno-exceptions diff --git a/goldlib/gall/gdefs.h b/goldlib/gall/gdefs.h index 6cc89bf..4778df3 100644 --- a/goldlib/gall/gdefs.h +++ b/goldlib/gall/gdefs.h @@ -144,7 +144,9 @@ typedef unsigned short uint16_t; typedef unsigned int uint32_t; #if !defined(__APPLE__) +#if !defined(__SUNOS__) typedef signed char int8_t; +#endif typedef signed short int16_t; typedef signed int int32_t; #endif diff --git a/goldlib/gall/gfile.h b/goldlib/gall/gfile.h index d39c0c2..bc82df2 100644 --- a/goldlib/gall/gfile.h +++ b/goldlib/gall/gfile.h @@ -161,7 +161,9 @@ public: #endif gfile& operator>> (char& i) { return operator>>((uint8_t&)i); } +#if !defined(__SUNOS__) gfile& operator>> (int8_t& i) { return operator>>((uint8_t&)i); } +#endif gfile& operator>> (int16_t& i) { return operator>>((uint16_t&)i); } gfile& operator>> (int32_t& i) { return operator>>((uint32_t&)i); } #if !defined(__CYGWIN__) @@ -179,7 +181,9 @@ public: #endif gfile& operator<< (char o) { return operator<<((uint8_t )o); } +#if !defined(__SUNOS__) gfile& operator<< (int8_t o) { return operator<<((uint8_t )o); } +#endif gfile& operator<< (int16_t o) { return operator<<((uint16_t)o); } gfile& operator<< (int32_t o) { return operator<<((uint32_t)o); } #if !defined(__CYGWIN__)