Changeset 1170 for trunk/gsdl/lib

Timestamp:

2000-05-12T15:09:27+12:00 (24 years ago)

Author:

sjboddie

Message:

minor modifications to get web library compiling under VC++ 6.0

Location:

trunk/gsdl/lib

Files:

• display.cpp (modified) (3 diffs)
• fileutil.cpp (modified) (4 diffs)
• gsdlconf.h (modified) (2 diffs)

trunk/gsdl/lib/display.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.20  2000/05/12 03:09:23  sjboddie
+   minor modifications to get web library compiling under VC++ 6.0
+
    Revision 1.19  2000/04/06 19:57:58  cs025
    Correcting a correction - reinstated all lib files due to silly
@@ -691 +694 @@
     // unicode text
     // get the next two characters
-    unsigned char c1 = 0, c2 = 0;
+    char c1 = 0, c2 = 0;
     if (!fin.eof()) fin.get(c1);
     if (!fin.eof()) fin.get(c2);
@@ -709 +712 @@
     // utf-8 text
     // how many characters we get depends on what we find
-    unsigned char c1 = 0, c2 = 0, c3 = 0;
+    char c1 = 0, c2 = 0, c3 = 0;
     while (!fin.eof()) {
       fin.get(c1);

trunk/gsdl/lib/fileutil.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.16  2000/05/12 03:09:22  sjboddie
+   minor modifications to get web library compiling under VC++ 6.0
+
    Revision 1.15  2000/05/04 08:27:28  sjboddie
    modifications for windows ports of GCC
@@ -121 +124 @@
   path2.erase (path2.begin(), here);
   
-  // return the concatenation of the two strings
-  return path1 + path2;
+  text_t fullpath = path1 + path2;
+
+  // make sure all the right slashes are used
+  here = fullpath.begin();
+  end = fullpath.end();
+  while (here != end) {
+#ifdef __WIN32__
+    if (*here == '/') *here = '\\';
+#else
+    if (*here == '\\') *here = '/';
+#endif
+    here ++;
+  }
+  return fullpath;
 }
 
@@ -142 +157 @@
 bool file_exists (const text_t &filename) {
   char *cstr = filename.getcstr();
+#ifdef GSDL_USE_IOS_H
   ifstream filestream (cstr, ios::in | ios::nocreate);
+#else
+  ifstream filestream (cstr, ios::in);
+#endif
   delete cstr;
 
@@ -158 +177 @@
 bool file_writable (const text_t &filename) {
   char *cstr = filename.getcstr();
+#ifdef GSDL_USE_IOS_H
   ifstream filestream (cstr, ios::out | ios::nocreate);
+#else
+  ifstream filestream (cstr, ios::out);
+#endif
   delete cstr;
 

trunk/gsdl/lib/gsdlconf.h

@@ -80 +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()
@@ -91 +109 @@
 #define GSDL_GET_FILEDESC(str) str.fd()
 #endif
-#if !defined(LK_UNLOCK) && defined(LK_UNLCK)
-#define LK_UNLOCK LK_UNLCK
+
+#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
-#define GSDL_UNLOCK_FILE(fd) _locking(fd, LK_UNLOCK, 200)
-#define GSDL_LOCK_FILE(fd) lock_val = _locking(fd, LK_NBLCK, 200)
 
 #else