Author: wyoung
Date: Fri Dec 22 15:18:52 2006
New Revision: 1344

URL: http://svn.gna.org/viewcvs/mysqlpp?rev=1344&view=rev
Log:
Fixed compile errors due to lack of ulong and incorrect def'n of min/max
macros in the MySQL headers in v5.0.  Doesn't fix MySQL++ building on
Windows, but it's a step forward.

Modified:
    trunk/lib/defs.h

Modified: trunk/lib/defs.h
URL: 
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/defs.h?rev=1344&r1=1343&r2=1344&view=diff
==============================================================================
--- trunk/lib/defs.h (original)
+++ trunk/lib/defs.h Fri Dec 22 15:18:52 2006
@@ -64,14 +64,23 @@
 
 /// \brief Alias for MYSQL_FIELD
 typedef MYSQL_FIELD Field;
+
 /// \brief Contraction for 'const char*'
 typedef const char cchar;
-#ifndef uint
+
+#if !defined(MYSQLPP_NO_UNSIGNED_INT_TYPES)
 /// \brief Contraction for 'unsigned int'
 typedef unsigned int uint;
+/// \brief Contraction for 'unsigned long'
+typedef unsigned long ulong;
 #endif
 
 } // end namespace mysqlpp
 
+// The MySQL headers define these macros, which is completely wrong in a
+// C++ project.  Undo the damage.
+#undef min
+#undef max
+
 #endif
 


_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits

Reply via email to