[Csp-commits] svn:csp r1260 - in trunk/CSP/SimData: . Include/SimData VisualStudio2003

[<sv...@ww...>]

Author: delta
Date: 2004-09-28 14:22:24 -0700 (Tue, 28 Sep 2004)
New Revision: 1260

Modified:
   trunk/CSP/SimData/CHANGES.current
   trunk/CSP/SimData/Include/SimData/AtomicCounter.h
   trunk/CSP/SimData/VisualStudio2003/SimData.vcproj
Log:
Added #undef ERROR for windows in AtomicCounter.h.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1260

Modified: trunk/CSP/SimData/CHANGES.current
===================================================================
--- trunk/CSP/SimData/CHANGES.current	2004-09-27 00:04:30 UTC (rev 1259)
+++ trunk/CSP/SimData/CHANGES.current	2004-09-28 21:22:24 UTC (rev 1260)
@@ -1,6 +1,9 @@
 Version 0.4.0 (in progress)
 ===========================
-
+2004-09-28: delta
+ * Added a #undef ERROR after inlcuding windows.h, protected behind
+   a #ifdef.
+   
 2004-09-26: onsight
  * Fix a couple compiler warnings under msvc.
 

Modified: trunk/CSP/SimData/Include/SimData/AtomicCounter.h
===================================================================
--- trunk/CSP/SimData/Include/SimData/AtomicCounter.h	2004-09-27 00:04:30 UTC (rev 1259)
+++ trunk/CSP/SimData/Include/SimData/AtomicCounter.h	2004-09-28 21:22:24 UTC (rev 1260)
@@ -41,6 +41,7 @@
 #  define _WINSOCKAPI_
 #  define NOMINMAX
 #  include <Windows.h>
+#  undef ERROR
 #else
 #  define LIN_ATOMIC
 extern "C" {

Modified: trunk/CSP/SimData/VisualStudio2003/SimData.vcproj
===================================================================
--- trunk/CSP/SimData/VisualStudio2003/SimData.vcproj	2004-09-27 00:04:30 UTC (rev 1259)
+++ trunk/CSP/SimData/VisualStudio2003/SimData.vcproj	2004-09-28 21:22:24 UTC (rev 1260)
@@ -116,7 +116,7 @@
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
+				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="3"
 				CompileAs="0"/>