[Csp-commits] svn:csp r1748 - trunk/CSP/csp/csplib/net

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

Author: mkrose
Date: 2005-12-10 22:35:43 -0800 (Sat, 10 Dec 2005)
New Revision: 1748

Modified:
   trunk/CSP/csp/csplib/net/NetworkInterface.cpp
   trunk/CSP/csp/csplib/net/NetworkNode.h
   trunk/CSP/csp/csplib/net/Sockets.h
Log:
Be more aggressive about removing min/max macros under win32.

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

Modified: trunk/CSP/csp/csplib/net/NetworkInterface.cpp
===================================================================
--- trunk/CSP/csp/csplib/net/NetworkInterface.cpp	2005-12-11 06:32:03 UTC (rev 1747)
+++ trunk/CSP/csp/csplib/net/NetworkInterface.cpp	2005-12-11 06:35:43 UTC (rev 1748)
@@ -45,6 +45,14 @@
 #endif
 #include <cc++/network.h>
 #include <cc++/thread.h>
+#ifdef _WIN32
+#	ifdef min
+#		undef min
+#	endif
+#	ifdef max
+#		undef max
+#	endif
+#endif
 
 #include <string.h>
 #include <sys/types.h>

Modified: trunk/CSP/csp/csplib/net/NetworkNode.h
===================================================================
--- trunk/CSP/csp/csplib/net/NetworkNode.h	2005-12-11 06:32:03 UTC (rev 1747)
+++ trunk/CSP/csp/csplib/net/NetworkNode.h	2005-12-11 06:35:43 UTC (rev 1748)
@@ -39,6 +39,12 @@
 
 #ifdef _WIN32
 #	pragma warning(pop)
+#	ifdef min
+#		undef min
+#	endif
+#	ifdef max
+#		undef max
+#	endif
 #endif
 
 #include <string>

Modified: trunk/CSP/csp/csplib/net/Sockets.h
===================================================================
--- trunk/CSP/csp/csplib/net/Sockets.h	2005-12-11 06:32:03 UTC (rev 1747)
+++ trunk/CSP/csp/csplib/net/Sockets.h	2005-12-11 06:35:43 UTC (rev 1748)
@@ -37,6 +37,12 @@
 
 #ifdef _WIN32
 #	pragma warning(pop)
+#	ifdef min
+#		undef min
+#	endif
+#	ifdef max
+#		undef max
+#	endif
 #endif
 
 CSP_NAMESPACE