Changeset 123 for cpp/frams

Timestamp:

02/10/14 17:08:23 (11 years ago)

Author:

sz

Message:

Cygwin compatibility

Location:

cpp/frams/virtfile

Files:

• virtfile.cpp (modified) (2 diffs)
• virtfile.h (modified) (1 diff)

cpp/frams/virtfile/virtfile.cpp

@@ -58 +58 @@
 int fread(void *ptr, size_t size, size_t nmemb, VirtFILE* f) {return f->Vread(ptr,size,nmemb);}
 int fwrite(const void *ptr, size_t size, size_t nmemb, VirtFILE* f) {return f->Vwrite(ptr,size,nmemb);}
+
+//for some systems, we need to #undef feof which is unfortunately defined as a macro... we have to #undef just to be able to define our own function with this name. Same in virtfile.h
+#if defined __BORLANDC__ || defined _MSC_VER || defined __CYGWIN__ || defined SHP
+ #undef feof
+#endif
+
+int feof(VirtFILE* f) {return f->Veof();}
+
+//...and then restore the original macro:
 #ifdef __BORLANDC__
-#undef feof
+ #define feof(__f)     ((__f)->flags & _F_EOF)
 #endif
 #ifdef _MSC_VER
-#undef feof
+ #define feof(_stream)     ((_stream)->_flag & _IOEOF)
+#endif
+#ifdef __CYGWIN__
+ #define feof(p)  __sfeof(p)
 #endif
 #ifdef SHP
-#undef feof
+ restore original macro... if you ever want to compile this code on bada
 #endif
-int feof(VirtFILE* f) {return f->Veof();}
-#ifdef __BORLANDC__
-#define feof(__f)     ((__f)->flags & _F_EOF)
-#endif
-#ifdef _MSC_VER
-#define feof(_stream)     ((_stream)->_flag & _IOEOF)
-#endif
+
 
 int fputc(int c,VirtFILE* f) {return f->Vputc(c);}
@@ -95 +101 @@
 int closedir(VirtDIR* d) {delete d; return 0;}
 dirent* readdir(VirtDIR* d) {return d->Vreaddir();}
+

cpp/frams/virtfile/virtfile.h

@@ -70 +70 @@
 DLLEXP int fread(void *ptr, size_t size, size_t nmemb, VirtFILE* f);
 DLLEXP int fwrite(const void *ptr, size_t size, size_t nmemb, VirtFILE* f);
+
+
+//for some systems, we need to #undef feof which is unfortunately defined as a macro... we have to #undef just to be able to define our own function with this name. Same in virtfile.cpp
+#if defined __BORLANDC__ || defined _MSC_VER || defined __CYGWIN__ || defined SHP
+ #undef feof
+#endif
+ 
+DLLEXP int feof(VirtFILE* f);// {return f->Veof();}
+
+//...and then restore the original macro:
 #ifdef __BORLANDC__
-#undef feof
+ #define feof(__f)     ((__f)->flags & _F_EOF)
 #endif
 #ifdef _MSC_VER
-#undef feof
+ #define feof(_stream)     ((_stream)->_flag & _IOEOF)
+#endif
+#ifdef __CYGWIN__
+ #define feof(p)  __sfeof(p)
 #endif
 #ifdef SHP
-#undef feof //not sure if this is OK since feof() is not defined below for bada, but it won't compile without this #undef. Same in virtfile.cpp
+ restore original macro... if you ever want to compile this code on bada
 #endif
-DLLEXP int feof(VirtFILE* f);// {return f->Veof();}
-#ifdef __BORLANDC__
-#define feof(__f)     ((__f)->flags & _F_EOF)
-#endif
-#ifdef _MSC_VER
-#define feof(_stream)     ((_stream)->_flag & _IOEOF)
-#endif
+
 
 DLLEXP int fputc(int c,VirtFILE* f);