Changeset 225
- Timestamp:
- 04/16/14 19:29:13 (10 years ago)
- Location:
- cpp/frams
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
cpp/frams/config/version.h
r197 r225 3 3 // Refer to http://www.framsticks.com/ for further information. 4 4 5 #define MAIN_REL_ID "4.0rc 8"5 #define MAIN_REL_ID "4.0rc9" -
cpp/frams/util/3d.h
r197 r225 6 6 #define _3D_H_ 7 7 8 #if def SHP8 #if defined SHP || defined __ANDROID__ 9 9 #include <string.h> //memcpy 10 10 #else -
cpp/frams/virtfile/virtfile.cpp
r206 r225 68 68 69 69 //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 70 #if defined _MSC_VER || defined __CYGWIN__ || defined SHP 70 #if defined _MSC_VER || defined __CYGWIN__ || defined SHP || defined __ANDROID__ 71 71 #pragma push_macro("feof") 72 72 #undef feof … … 79 79 80 80 //...and then restore the original macro: 81 #if defined _MSC_VER || defined __CYGWIN__ || defined SHP 81 #if defined _MSC_VER || defined __CYGWIN__ || defined SHP || defined __ANDROID__ 82 82 #pragma pop_macro("feof") 83 83 #endif 84 #if def__BORLANDC__84 #if defined __BORLANDC__ 85 85 #define feof(__f) ((__f)->flags & _F_EOF) 86 86 #endif -
cpp/frams/virtfile/virtfile.h
r211 r225 73 73 74 74 //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 75 #if defined _MSC_VER || defined __CYGWIN__ || defined SHP 75 #if defined _MSC_VER || defined __CYGWIN__ || defined SHP || defined __ANDROID__ 76 76 #pragma push_macro("feof") 77 77 #undef feof … … 84 84 85 85 //...and then restore the original macro: 86 #if defined _MSC_VER || defined __CYGWIN__ || defined SHP 86 #if defined _MSC_VER || defined __CYGWIN__ || defined SHP || defined __ANDROID__ 87 87 #pragma pop_macro("feof") 88 88 #endif 89 #if def__BORLANDC__89 #if defined __BORLANDC__ 90 90 #define feof(__f) ((__f)->flags & _F_EOF) 91 91 #endif
Note: See TracChangeset
for help on using the changeset viewer.