Changeset 131 for cpp/frams

Timestamp:

02/11/14 00:01:21 (11 years ago)

Author:

Maciej Komosinski

Message:

a better way to save/restore a preprocessor macro, unfortunately not a c++ standard (yet?)

Location:

cpp/frams/virtfile

Files:

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

cpp/frams/virtfile/virtfile.cpp

@@ -59 +59 @@
 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
+
+//since we want our own feof(VirtFILE*) function and some systems unfortunately define feof as a macro, we need to #undef it. Same as in virtfile.h
+#if defined _MSC_VER || defined __CYGWIN__ || defined SHP
+ #pragma push_macro("feof")
+ #undef feof
+#endif
+#if defined __BORLANDC__ //does not support #pragma push_macro/pop_macro 
  #undef feof
 #endif
@@ -67 +72 @@
 
 //...and then restore the original macro:
+#if defined _MSC_VER || defined __CYGWIN__ || defined SHP
+ #pragma pop_macro("feof")
+#endif
 #ifdef __BORLANDC__
  #define feof(__f)     ((__f)->flags & _F_EOF)
-#endif
-#ifdef _MSC_VER
- #define feof(_stream)     ((_stream)->_flag & _IOEOF)
-#endif
-#ifdef __CYGWIN__
- #define feof(p)  __sfeof(p)
-#endif
-#ifdef SHP
- restore original macro... if you ever want to compile this code on bada
 #endif
 

cpp/frams/virtfile/virtfile.h

@@ -72 +72 @@
 
 
-//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
+//since we want our own feof(VirtFILE*) function and some systems unfortunately define feof as a macro, we need to #undef it. Same as in virtfile.cpp
+#if defined _MSC_VER || defined __CYGWIN__ || defined SHP
+ #pragma push_macro("feof")
+ #undef feof
+#endif
+#if defined __BORLANDC__ //does not support #pragma push_macro/pop_macro 
  #undef feof
 #endif
@@ -80 +84 @@
 
 //...and then restore the original macro:
+#if defined _MSC_VER || defined __CYGWIN__ || defined SHP
+ #pragma pop_macro("feof")
+#endif
 #ifdef __BORLANDC__
  #define feof(__f)     ((__f)->flags & _F_EOF)
-#endif
-#ifdef _MSC_VER
- #define feof(_stream)     ((_stream)->_flag & _IOEOF)
-#endif
-#ifdef __CYGWIN__
- #define feof(p)  __sfeof(p)
-#endif
-#ifdef SHP
- restore original macro... if you ever want to compile this code on bada
 #endif