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

Add QNX6 port (Mike Gorchak), remove obsolete stuff

Browse Source
This commit is contained in:
Alexander S. Aganichev 2003-04-16 08:43:49 +00:00
parent b45a762d2e
commit e9e33d7860
7 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
golded3/gcarea.cpp
View File

@ -1016,9 +1016,9 @@ char* MapPath(char* map, bool reverse) {
char sl1, sl2; char sl1, sl2;
char* ptr; char* ptr;
ptr = strpbrk(p, "/\\"); ptr = strpbrk((char *)p, "/\\");
sl1 = ptr ? *ptr : NUL; sl1 = ptr ? *ptr : NUL;
ptr = strpbrk(q, "/\\"); ptr = strpbrk((char *)q, "/\\");
sl2 = ptr ? *ptr : NUL; sl2 = ptr ? *ptr : NUL;
if(sl1 and sl2 and (sl1 != sl2)) if(sl1 and sl2 and (sl1 != sl2))

5
golded3/golded3.cpp
View File

@ -116,6 +116,11 @@ const char* __gver_shortver__ = __GVER_SVER__(__GVER_MAJOR__,__GVER_MINOR__,__GV
#define __GVER_SHORTPLATFORM__ "BeOS" #define __GVER_SHORTPLATFORM__ "BeOS"
#define __GVER_SHORTLOGNAME__ "B" #define __GVER_SHORTLOGNAME__ "B"
#define __GVER_CFGEXT__ ".gbe" #define __GVER_CFGEXT__ ".gbe"
#elif defined(__QNXNTO__)
#define __GVER_PLATFORM__ "/QNX"
#define __GVER_SHORTPLATFORM__ "QNX"
#define __GVER_SHORTLOGNAME__ "Q"
#define __GVER_CFGEXT__ ".gqx"
#elif defined(__UNIX__) #elif defined(__UNIX__)
#define __GVER_PLATFORM__ "/UNX" #define __GVER_PLATFORM__ "/UNX"
#define __GVER_SHORTPLATFORM__ "UNX" #define __GVER_SHORTPLATFORM__ "UNX"

3
goldlib/gall/gcmpall.h
View File

@ -74,6 +74,9 @@
#if defined(__BEOS__) #if defined(__BEOS__)
#define __UNIX__ __BEOS__ #define __UNIX__ __BEOS__
#endif #endif
#if defined(__QNXNTO__)
#define __UNIX__ __QNXNTO__
#endif
#endif #endif
#ifdef __GNUC__ #ifdef __GNUC__

10
goldlib/gall/gfile.cpp
View File

@ -225,16 +225,6 @@ int gfile::unlock(long __offset, long __len) {
return _ret; return _ret;
} }
// ------------------------------------------------------------------
int gfile::eof() {
int _ret = ::eof(fh);
status = (_ret == -1) ? errno : 0;
return _ret;
}
// ------------------------------------------------------------------ // ------------------------------------------------------------------
int gfile::getftime(dword* __ftime) { int gfile::getftime(dword* __ftime) {

2
goldlib/gall/gfile.h
View File

@ -112,8 +112,6 @@ public:
int getftime (dword* __ftime); int getftime (dword* __ftime);
int eof ();
// -------------------------------------------------------------- // --------------------------------------------------------------
// ANSI-style streaming buffered I/O // ANSI-style streaming buffered I/O

12
goldlib/gall/gfilutil.h
View File

@ -52,7 +52,7 @@
// ------------------------------------------------------------------M // ------------------------------------------------------------------M
#if defined(__UNIX__) #if defined(__UNIX__)
#if !defined(__BEOS__) #if !defined(__BEOS__) && !defined(__QNXNTO__)
#define O_TEXT 0 #define O_TEXT 0
#define O_BINARY 0 #define O_BINARY 0
#endif #endif
@ -236,22 +236,18 @@ int unlock(int handle, long offset, long length);
#if !defined(__DJGPP__) && defined(__GNUC__) #if !defined(__DJGPP__) && defined(__GNUC__)
int lock(int handle, long offset, long length); int lock(int handle, long offset, long length);
int unlock(int handle, long offset, long length); int unlock(int handle, long offset, long length);
#if !defined(__QNXNTO__) && !defined(__MINGW32__)
inline long tell(int fh) { return lseek(fh, 0, SEEK_CUR); } inline long tell(int fh) { return lseek(fh, 0, SEEK_CUR); }
#endif #endif
#endif
#if !defined(__MINGW32__) && !defined(__EMX__) && defined(__GNUC__) #if !defined(sopen) && !defined(__MINGW32__) && !defined(__EMX__) && !defined(__QNXNTO__) && defined(__GNUC__)
inline int eof(int h) {
return tell(h) > filelength(h);
}
inline int sopen(const char* path, int access, int shflag, int mode) { inline int sopen(const char* path, int access, int shflag, int mode) {
#ifdef __UNIX__ #ifdef __UNIX__
shflag = 0; shflag = 0;
#endif #endif
return open(path, access|shflag, mode); return open(path, access|shflag, mode);
} }
#endif #endif
#if defined(__UNIX__) || defined(__CYGWIN__) #if defined(__UNIX__) || defined(__CYGWIN__)

3
goldlib/gall/gstrall.h
View File

@ -44,6 +44,9 @@
#define strupr(s) (char *)_nls_strupr((unsigned char *)(s)) #define strupr(s) (char *)_nls_strupr((unsigned char *)(s))
#define strlwr(s) (char *)_nls_strlwr((unsigned char *)(s)) #define strlwr(s) (char *)_nls_strlwr((unsigned char *)(s))
#elif defined(__GNUC__) #elif defined(__GNUC__)
#if defined(__QNXNTO__)
#include <strings.h>
#endif
#define stricmp strcasecmp #define stricmp strcasecmp
#define strnicmp strncasecmp #define strnicmp strncasecmp
char* strupr(char* s); char* strupr(char* s);