diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Exceptions.h | 4 | ||||
| -rw-r--r-- | include/generic.h | 25 |
2 files changed, 26 insertions, 3 deletions
diff --git a/include/Exceptions.h b/include/Exceptions.h index 470ee45..901bd33 100644 --- a/include/Exceptions.h +++ b/include/Exceptions.h @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: Exceptions.h,v 1.40 2004-11-28 12:20:10 pixel Exp $ */ +/* $Id: Exceptions.h,v 1.41 2005-02-17 08:33:49 pixel Exp $ */ #ifndef __EXCEPTIONS_H__ #define __EXCEPTIONS_H__ @@ -56,6 +56,7 @@ class Base { static void * malloc(ssize_t s); static void * realloc(void * p, size_t s); static void * calloc(size_t n, size_t s); + static int dup(int); void * operator new(size_t s); void * operator new(size_t s, void * p); void operator delete(void * p); @@ -102,6 +103,7 @@ class GeneralException : public Base { char * xstrdup(const char *); void * xmalloc(size_t) throw (GeneralException); void * xrealloc(void *, size_t); +int xdup(int) throw (GeneralException); int xpipe(int *, int = 0) throw (GeneralException); pid_t xfork() throw (GeneralException); //! This will simply throw the Exit exception. diff --git a/include/generic.h b/include/generic.h index 4f71654..ee41652 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.32 2004-12-27 18:49:30 pixel Exp $ */ +/* $Id: generic.h,v 1.33 2005-02-17 08:33:49 pixel Exp $ */ #ifndef __GENERIC_H__ #define __GENERIC_H__ @@ -42,6 +42,26 @@ #define bcopy(x,y,z) memcpy((y),(x),(z)) #endif +#ifdef __MIPSEL__ +/* we most probably are in ps2dev here */ +#include <tamtypes.h> +#include <stddef.h> + +typedef u64 Uint64; +typedef s64 int64; +typedef u32 Uint32; +typedef s32 int32; +typedef u16 Uint16; +typedef s16 int16; +typedef u8 Uint8; +typedef s8 int8; + +typedef u8 Byte; +typedef u16 Word; +typedef u32 DWord; + +#else + #if ! defined SDL_VERSIONNUM && ! defined Uint32 typedef unsigned long int Uint32; #endif @@ -93,6 +113,7 @@ typedef unsigned _int64 Uint64; #error Unsupported platform (need 64 bits ints definition) #endif #endif +#endif #ifndef PACKED #if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__ || defined __APPLE__ @@ -189,7 +210,7 @@ inline T ABS(T x) { #include <direct.h> #define MKDIR mkdir #else -#error Unknow compiler/platform +#warning Unknow compiler/platform; MKDIR not defined. #endif #endif |