diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Exceptions.h | 2 | ||||
| -rw-r--r-- | include/generic.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/Exceptions.h b/include/Exceptions.h index 40f402f..98f6c52 100644 --- a/include/Exceptions.h +++ b/include/Exceptions.h @@ -7,7 +7,7 @@ #include <stdlib.h> #include <generic.h> -#ifndef pid_t +#if !defined pid_t && !defined _SYS_TYPES_H typedef int pid_t; #endif diff --git a/include/generic.h b/include/generic.h index 46e35ff..aa6033e 100644 --- a/include/generic.h +++ b/include/generic.h @@ -55,11 +55,11 @@ typedef Uint16 Word; typedef Uint32 DWord; #endif -#ifndef __ssize_t_defined +#if !defined __ssize_t_defined && !defined _SSIZE_T typedef int32 ssize_t; #endif -#if defined __linux__ || defined __solaris__ || defined __CYGWIN32__ || defined FORCE64 +#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined FORCE64 typedef long long int64; typedef unsigned long long uint64; #else @@ -72,7 +72,7 @@ typedef unsigned _int64 uint64; #endif #ifndef PACKED -#if defined __linux__ || defined __CYGWIN32__ +#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ #define PACKED __attribute__((packed)) #else // PACKED #define PACKED @@ -133,7 +133,7 @@ inline T ABS(T x) { - (((x)>>3)&0x11111111)) #define ISPOT(x) (((x)&(x-1))==0?1:0) -#if defined __linux__ || defined __CYGWIN32__ +#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ #define MKDIR(name) mkdir(name, 0777) #else #if defined __WIN32__ || defined _WIN32 |