bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to build native cygwin using 'make PLATFORM=lnx'

Browse Source
This commit is contained in:
Stas Degteff 2005-12-14 16:18:30 +00:00
parent 577c3fb0fe
commit 240842ff68
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
goldlib/gall/gdefs.h
View File

@ -38,7 +38,7 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#include <windows.h> #include <windows.h>
#include <limits.h> #include <limits.h>
#elif defined(__MINGW32__) #elif defined(__MINGW32__) || defined(__CYGWIN__)
#include <stdint.h> #include <stdint.h>
#else #else
#endif #endif
@ -129,7 +129,7 @@ typedef unsigned int uint32_t;
#endif #endif
#endif /*#ifdef _MSC_VER */ #endif /*#ifdef _MSC_VER */
#if defined(__GNUC__) && !defined(__MINGW32__) #if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__CYGWIN__)
typedef unsigned char uint8_t; typedef unsigned char uint8_t;
typedef unsigned short uint16_t; typedef unsigned short uint16_t;
typedef unsigned int uint32_t; typedef unsigned int uint32_t;

10
goldlib/gall/gfile.h
View File

@ -156,12 +156,17 @@ public:
gfile& operator>> (uint8_t& i); gfile& operator>> (uint8_t& i);
gfile& operator>> (uint16_t& i); gfile& operator>> (uint16_t& i);
gfile& operator>> (uint32_t& i); gfile& operator>> (uint32_t& i);
#if !defined(__CYGWIN__)
gfile& operator>> (unsigned long& i); gfile& operator>> (unsigned long& i);
#endif
gfile& operator>> (char& i) { return operator>>((uint8_t&)i); } gfile& operator>> (char& i) { return operator>>((uint8_t&)i); }
gfile& operator>> (int8_t& i) { return operator>>((uint8_t&)i); } gfile& operator>> (int8_t& i) { return operator>>((uint8_t&)i); }
gfile& operator>> (int16_t& i) { return operator>>((uint16_t&)i); } gfile& operator>> (int16_t& i) { return operator>>((uint16_t&)i); }
gfile& operator>> (int32_t& i) { return operator>>((uint32_t&)i); } gfile& operator>> (int32_t& i) { return operator>>((uint32_t&)i); }
#if !defined(__CYGWIN__)
gfile& operator>> (long& i) { return operator>>((unsigned long&)i); } gfile& operator>> (long& i) { return operator>>((unsigned long&)i); }
#endif
#ifdef __GOLDWARE_HAS_BOOL #ifdef __GOLDWARE_HAS_BOOL
gfile& operator<< (bool o); gfile& operator<< (bool o);
@ -169,12 +174,17 @@ public:
gfile& operator<< (uint8_t o); gfile& operator<< (uint8_t o);
gfile& operator<< (uint16_t o); gfile& operator<< (uint16_t o);
gfile& operator<< (uint32_t o); gfile& operator<< (uint32_t o);
#if !defined(__CYGWIN__)
gfile& operator<< (unsigned long o); gfile& operator<< (unsigned long o);
#endif
gfile& operator<< (char o) { return operator<<((uint8_t )o); } gfile& operator<< (char o) { return operator<<((uint8_t )o); }
gfile& operator<< (int8_t o) { return operator<<((uint8_t )o); } gfile& operator<< (int8_t o) { return operator<<((uint8_t )o); }
gfile& operator<< (int16_t o) { return operator<<((uint16_t)o); } gfile& operator<< (int16_t o) { return operator<<((uint16_t)o); }
gfile& operator<< (int32_t o) { return operator<<((uint32_t)o); } gfile& operator<< (int32_t o) { return operator<<((uint32_t)o); }
#if !defined(__CYGWIN__)
gfile& operator<< (long o) { return operator<<((unsigned long)o); } gfile& operator<< (long o) { return operator<<((unsigned long)o); }
#endif
}; };