Changeset 1150 for trunk/gsdl/lib

Timestamp:

2000-05-04T20:32:31+12:00 (24 years ago)

Author:

sjboddie

Message:

modifications for windows ports of GCC

Location:

trunk/gsdl/lib

Files:

• fileutil.cpp (modified) (2 diffs)
• gsdlconf.h (modified) (2 diffs)

trunk/gsdl/lib/fileutil.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.15  2000/05/04 08:27:28  sjboddie
+   modifications for windows ports of GCC
+
    Revision 1.14  2000/04/06 19:57:59  cs025
    Correcting a correction - reinstated all lib files due to silly
@@ -168 +171 @@
 }
 
-#if defined __WIN32__
+#if defined(__WIN32__) && !defined(__GNUC__)
 
 #include <windows.h>
 
-BOOL read_dir (const text_t &dirname, text_tarray &filelist) {
+bool read_dir (const text_t &dirname, text_tarray &filelist) {
   
   WIN32_FIND_DATA FileData;  
   HANDLE hSearch; 
-  DWORD dwAttrs; 
   char *dirpath = dirname.getcstr();
   strcat (dirpath, "\\*");
-
-  BOOL finished = false; 
   
   hSearch = FindFirstFile(dirpath, &FileData); 

trunk/gsdl/lib/gsdlconf.h

@@ -30 +30 @@
 #define GSDLCONF_H
 
-#ifndef __WIN32__
+#if defined(__WIN32__)
+#include "../win32cfg.h"
+#else
 #include "../config.h"
 #endif
@@ -84 +86 @@
 #include <io.h>
 #include <sys/locking.h>
+#if defined(__GNUC__)
+#define GSDL_GET_FILEDESC(str) str.filedesc()
+#else
 #define GSDL_GET_FILEDESC(str) str.fd()
-#define GSDL_UNLOCK_FILE(fd) _locking(fd, LK_UNLCK, 200)
+#endif
+#define GSDL_UNLOCK_FILE(fd) _locking(fd, LK_UNLOCK, 200)
 #define GSDL_LOCK_FILE(fd) lock_val = _locking(fd, LK_NBLCK, 200)