Author: wyoung
Date: Mon Jan 6 21:11:04 2014
New Revision: 2762
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2762&view=rev
Log:
- No longer #including winsock.h explicitly in common.h on Windows.
Connector/C does it for us. It used to not matter, but they probably
recently switched to the Winsock 2 header or something like that,
because we're now getting conflicting definitions for struct sockaddr
and such.
- #defining NOMINMAX in common.h to prevent windows.h from #defining its
own min and max macros, which now conflict with std::min and max, in
VC++ 2013.
Modified:
trunk/lib/common.h
Modified: trunk/lib/common.h
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/common.h?rev=2762&r1=2761&r2=2762&view=diff
==============================================================================
--- trunk/lib/common.h (original)
+++ trunk/lib/common.h Mon Jan 6 21:11:04 2014
@@ -51,7 +51,9 @@
# define MYSQLPP_PLATFORM_WINDOWS
// Windows compiler support. Tested with Microsoft Visual C++,
// Borland C++ Builder, and MinGW GCC.
-# include <winsock.h>
+
+ // Don't let windows.h (via Connector/C) #define min/max
+ #define NOMINMAX
// Stuff for Visual C++ only
# if defined(_MSC_VER)
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
