Changeset 3155 for trunk

Timestamp:

2002-06-17T21:20:27+12:00 (22 years ago)

Author:

sjboddie

Message:

Removed the crappy GSDL_GET_FILEDESC stuff as it's no longer needed now
that we're using C style I/O when file locking is required.

File:

• trunk/gsdl/lib/gsdlconf.h (modified) (1 diff)

trunk/gsdl/lib/gsdlconf.h

@@ -100 +100 @@
 #endif
 
-#if defined (GSDL_USE_IOS_H)
 #include <io.h>
 #include <sys/locking.h>
-
-#if defined(__GNUC__) /* not gcc >= 3 - this has GSDL_USE_IOS_H */
-#define GSDL_GET_FILEDESC(str) str.filedesc()
-#else
-#define GSDL_GET_FILEDESC(str) str.fd()
-#endif
 
 #define GSDL_UNLOCK_FILE(fd) _locking(fd, LK_UNLCK, 200)
 #define GSDL_LOCK_FILE(fd) lock_val = _locking(fd, LK_NBLCK, 200)
 
-#else    /* ifdef GSDL_USE_IOS_H */
-
-// when using <fstream> (i.e. VC++ 6.0) I can't work out how
-// to return a filedesc. File locking won't currently work
-// for those windows compilers requiring GSDL_USE_IOS_H to
-// not be set -- Stefan.
-#define GSDL_GET_FILEDESC(str) 1
-#define GSDL_LOCK_FILE(fd) lock_val = 0
-#define GSDL_UNLOCK_FILE(fd) 0
-#endif
-
 #else     /* not WIN32 */
-// darwin (Mac OS X) requires _STREAM_COMPAT to be set when
-// including <fstream.h> for filedesc() to be declared...
-#define GSDL_GET_FILEDESC(str) str.filedesc()
 
 #if GSDL_USE_FLOCK