Changeset 1279 for branches/New_Config_Format-branch/gsdl/lib/gsdlconf.h

Timestamp:

2000-07-13T10:21:53+12:00 (24 years ago)

Author:

sjboddie

Message:

merged changes to trunk into New_Config_Format branch

File:

• branches/New_Config_Format-branch/gsdl/lib/gsdlconf.h (modified) (2 diffs)

branches/New_Config_Format-branch/gsdl/lib/gsdlconf.h

@@ -30 +30 @@
 #define GSDLCONF_H
 
-#ifndef __WIN32__
+#if defined(__WIN32__)
+#include "../win32cfg.h"
+#else
 #include "../config.h"
 #endif
@@ -78 +80 @@
 #endif
 
+// mktemp
+
+#if !defined(__WIN32__) || defined(__GNUC__)
+#include <unistd.h>
+#define GSDL_MKTEMP(str) mktemp(str)
+#else
+#include <io.h>
+#define GSDL_MKTEMP(str) _mktemp(str)
+#endif
+
+
 
 // file locking
 
 #if defined(__WIN32__)
+
+#if !defined(LK_UNLOCK) && defined(LK_UNLCK)
+#define LK_UNLOCK LK_UNLCK
+#endif
+
+#if defined (GSDL_USE_IOS_H)
 #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()
+#endif
+
 #define GSDL_UNLOCK_FILE(fd) _locking(fd, LK_UNLCK, 200)
 #define GSDL_LOCK_FILE(fd) lock_val = _locking(fd, LK_NBLCK, 200)
+
+#else
+
+// 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