Changeset 3009

Timestamp:

2002-02-27T11:56:15+13:00 (22 years ago)

Author:

jrm21

Message:

Modified some macros for GCC only if GCC version is less than 3.

File:

• trunk/gsdl/lib/gsdlconf.h (modified) (5 diffs)

trunk/gsdl/lib/gsdlconf.h

@@ -47 +47 @@
 // GSDL_USE_IOS_H should be defined if the .h extension needs to
 // be used for the io stream headers
-#if defined(__GNUG__) || defined(__IBMCPP__)
+#if (defined(__GNUG__)  && __GNUG__ + 0 < 3) || defined(__IBMCPP__)
 #  define GSDL_USE_IOS_H 1
 #endif
@@ -65 +65 @@
 // GSDL_NAMESPACE_BROKEN should be defined if namespaces should
 // not be used
-#if defined(__GNUG__) || defined(__IBMCPP__)
+#if (defined(__GNUG__)  && __GNUG__ + 0 < 3) || defined(__IBMCPP__)
 #  define GSDL_NAMESPACE_BROKEN 1
 #endif
@@ -104 +104 @@
 #include <sys/locking.h>
 
-#if defined(__GNUC__)
+#if defined(__GNUC__) /* not gcc >= 3 - this has GSDL_USE_IOS_H */
 #define GSDL_GET_FILEDESC(str) str.filedesc()
 #else
@@ -113 +113 @@
 #define GSDL_LOCK_FILE(fd) lock_val = _locking(fd, LK_NBLCK, 200)
 
-#else    /* ifdef GSDL_SE_IOS_H */
+#else    /* ifdef GSDL_USE_IOS_H */
 
 // when using <fstream> (i.e. VC++ 6.0) I can't work out how
@@ -151 +151 @@
 #define GSDL_LOCK_FILE(fd) lock_val = flock (fd, LOCK_EX + LOCK_NB)
 
-#else
+#else  /* ! GSDL_USE_FLOCK */
 // use fcntl
 #include <fcntl.h>