Changeset 2423

Timestamp:

2001-05-16T12:51:51+12:00 (23 years ago)

Author:

jrm21

Message:

minor changes for darwin and cygwin

Location:

trunk/gsdl/lib

Files:

• gsdlconf.h (modified) (3 diffs)
• text_t.h (modified) (1 diff)

trunk/gsdl/lib/gsdlconf.h

@@ -28 +28 @@
 #define GSDLCONF_H
 
-#if defined(__WIN32__)
+#if defined(__WIN32__) && !defined(__CYGWIN__)
 #include "../win32cfg.h"
 #else
@@ -111 +111 @@
 #define GSDL_LOCK_FILE(fd) lock_val = _locking(fd, LK_NBLCK, 200)
 
-#else
+#else    /* ifdef GSDL_SE_IOS_H */
 
 // when using <fstream> (i.e. VC++ 6.0) I can't work out how
@@ -122 +122 @@
 #endif
 
-#else
+#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()
 

trunk/gsdl/lib/text_t.h

@@ -315 +315 @@
 
 #if defined(GSDL_USE_IOS_H)
-#include <ostream.h>
+#include <iostream.h> // darwin doesn't have ostream.h...
 #else
 #include <ostream>