[ros-diffs] [tkreuzer] 34835: gcc defines _WIN32 for us ... on a 64bit target. hack windef to get rid of it. This fixes zlib.

Author: tkreuzer
Date: Sun Jul 27 04:07:31 2008
New Revision: 34835

URL: http://svn.reactos.org/svn/reactos?rev=34835&view=rev
Log:
gcc defines _WIN32 for us ... on a 64bit target. hack windef to get rid of it. This fixes
zlib.

Modified:
    branches/ros-amd64-bringup/reactos/include/psdk/windef.h

Modified: branches/ros-amd64-bringup/reactos/include/psdk/windef.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/windef.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/windef.h [iso-8859-1] Sun Jul 27
04:07:31 2008
@@ -25,12 +25,23 @@
  * including windows.h or any other method of including the windef.h header.
  */
 #endif
+
+#if !defined(WIN64) && !defined(_M_AMD64) && !defined(_M_IA64)
 #ifndef WIN32
 #define WIN32
 #endif
 #ifndef _WIN32
 #define _WIN32
 #endif
+#else // WIN64
+#ifdef WIN32
+#undef WIN32
+#endif
+#ifdef _WIN32
+#undef _WIN32
+#endif
+#endif // WIN64
+
 #define FAR
 #define far
 #define NEAR