diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/generic.h | 18 | ||||
| -rw-r--r-- | include/gettext.h | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/generic.h b/include/generic.h index 17eab32..85f178b 100644 --- a/include/generic.h +++ b/include/generic.h @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: generic.h,v 1.26 2004-02-18 00:02:55 pixel Exp $ */ +/* $Id: generic.h,v 1.27 2004-03-01 07:41:47 pixel Exp $ */ #ifndef __GENERIC_H__ #define __GENERIC_H__ @@ -76,11 +76,11 @@ typedef Uint16 Word; typedef Uint32 DWord; #endif -#if !defined __ssize_t_defined && !defined _SSIZE_T && !defined ssize_t +#if !defined __ssize_t_defined && !defined _SSIZE_T && !defined ssize_t && !defined _BSD_SSIZE_T_DEFINED_ typedef int32 ssize_t; #endif -#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__ || defined FORCE64 +#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__ || defined FORCE64 || defined __APPLE__ typedef long long int64; typedef unsigned long long Uint64; #else @@ -93,7 +93,7 @@ typedef unsigned _int64 Uint64; #endif #ifndef PACKED -#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__ +#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__ || defined __APPLE__ #define PACKED __attribute__((packed)) #else // PACKED #define PACKED @@ -101,12 +101,12 @@ typedef unsigned _int64 Uint64; #endif // !PACKED #ifndef PPACKED -#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__ +#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__ || defined __APPLE__ #define PPACKED -#else // PACKED +#else // PPACKED #define PPACKED __declspec(align(1)) #endif -#endif // !PACKED +#endif // !PPACKED extern char verbosity; char ** split(char * s, char t); @@ -144,7 +144,7 @@ inline T ABS(T x) { } #endif -#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__ +#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__ || defined __APPLE__ #define FUNCNAME String(__PRETTY_FUNCTION__) #else #define FUNCNAME String(__FUNCSIG__) @@ -168,7 +168,7 @@ inline T ABS(T x) { - (((x)>>3)&0x11111111)) #define ISPOT(x) (((x)&(x-1))==0?1:0) -#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ +#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __APPLE__ #define MKDIR(name) mkdir(name, 0777) #else #if defined __WIN32__ || defined _WIN32 diff --git a/include/gettext.h b/include/gettext.h index bb3158f..de7395c 100644 --- a/include/gettext.h +++ b/include/gettext.h @@ -20,7 +20,7 @@ #define _LIBGETTEXT_H 1 /* NLS can be disabled through the configure --disable-nls option. */ -#if ENABLE_NLS +#if ENABLE_NLS && defined HAVE_LIBINTL_H /* Get declarations of GNU message catalog functions. */ # include <libintl.h> |