[Sumover-dev] [svn commit] r4467 - tk-8.0/trunk/win

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Mon Jun 22 11:52:14 2009
New Revision: 4467

Modified:
   tk-8.0/trunk/win/tkWin.h

Log:
Add an "#undef Status" to avoid the following errors on Visual Studio 8 Pro on Windows 7:

c:\program files\microsoft sdks\windows\v6.0a\include\winnt.h(8731) : error C2628: 'DWORD64' followed by 'int' is illegal (did you forget a ';'?)
c:\program files\microsoft sdks\windows\v6.0a\include\winnt.h(8731) : error C2208: 'unsigned __int64' : no members defined using this type
c:\program files\microsoft sdks\windows\v6.0a\include\winnt.h(8844) : error C2628: 'DWORD' followed by 'int' is illegal (did you forget a ';'?)
c:\program files\microsoft sdks\windows\v6.0a\include\winnt.h(8844) : error C2208: 'unsigned long' : no members defined using this type
tkWinWm.c
c:\program files\microsoft sdks\windows\v6.0a\include\winnt.h(8731) : error C2628: 'DWORD64' followed by 'int' is illegal (did you forget a ';'?)
c:\program files\microsoft sdks\windows\v6.0a\include\winnt.h(8731) : error C2208: 'unsigned __int64' : no members defined using this type
c:\program files\microsoft sdks\windows\v6.0a\include\winnt.h(8844) : error C2628: 'DWORD' followed by 'int' is illegal (did you forget a ';'?)
c:\program files\microsoft sdks\windows\v6.0a\include\winnt.h(8844) : error C2208: 'unsigned long' : no members defined using this type
...


Modified: tk-8.0/trunk/win/tkWin.h
==============================================================================
--- tk-8.0/trunk/win/tkWin.h	(original)
+++ tk-8.0/trunk/win/tkWin.h	Mon Jun 22 11:52:14 2009
@@ -19,6 +19,9 @@
 #include <tk.h>
 #endif
 
+#ifdef Status
+#undef Status
+#endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #undef WIN32_LEAN_AND_MEAN