[GEM-cvs] Gem/src/Pixes FreeFrame.h,1.5,1.6
Brought to you by:
zmoelnig
From: IOhannes m z. <zmo...@us...> - 2006-06-01 13:52:54
|
Update of /cvsroot/pd-gem/Gem/src/Pixes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30888 Modified Files: FreeFrame.h Log Message: added some more tests for defines when we are on w32 Index: FreeFrame.h =================================================================== RCS file: /cvsroot/pd-gem/Gem/src/Pixes/FreeFrame.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FreeFrame.h 4 Jul 2005 12:10:00 -0000 1.5 --- FreeFrame.h 1 Jun 2006 13:52:48 -0000 1.6 *************** *** 52,64 **** */ ! #ifdef WIN32 ! #if _MSC_VER > 1000 ! #pragma once ! #endif /* _MSC_VER > 1000 */ ! #ifndef WIN32_LEAN_AND_MEAN ! # define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ ! #endif /* WIN32_LEAN_AND_MEAN */ ! #include <windows.h> #elif defined(__linux__) || defined(__APPLE__) --- 52,66 ---- */ ! #if defined(WIN32) || defined (__WIN32__) || defined (_MSC_VER) ! # if _MSC_VER > 1000 ! # pragma once ! # endif /* _MSC_VER > 1000 */ ! ! # ifndef WIN32_LEAN_AND_MEAN ! # define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ ! # endif /* WIN32_LEAN_AND_MEAN */ ! ! # include <windows.h> #elif defined(__linux__) || defined(__APPLE__) *************** *** 68,72 **** typedef unsigned char BYTE; ! #endif --- 70,74 ---- typedef unsigned char BYTE; ! #endif /* OS */ |