summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpixel <pixel>2007-06-19 13:39:34 +0000
committerpixel <pixel>2007-06-19 13:39:34 +0000
commitbb2a29b3cbe7cdd29010a652b1aaf55ade2c1f28 (patch)
tree48cbb31729c88c3863eceaacdc1e90d337aa7a06
parentf827d071ff3f8c45aca1cc5e4b9b7b71729313e3 (diff)
Work around to avoid dummy #defines...
-rw-r--r--include/SQL.h6
-rw-r--r--lib/SQL.cc6
2 files changed, 10 insertions, 2 deletions
diff --git a/include/SQL.h b/include/SQL.h
index 786d28f..1c4131e 100644
--- a/include/SQL.h
+++ b/include/SQL.h
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: SQL.h,v 1.12 2007-06-14 14:12:20 pixel Exp $ */
+/* $Id: SQL.h,v 1.13 2007-06-19 13:39:34 pixel Exp $ */
#ifndef __SQL_H__
#define __SQL_H__
@@ -26,6 +26,10 @@
#include <mysql.h>
#include <Exceptions.h>
+#ifdef errno
+#undef errno
+#endif
+
typedef std::map<String, String> AssocArray;
typedef std::map<String, String>::iterator AssocArrayIterator;
diff --git a/lib/SQL.cc b/lib/SQL.cc
index 5f86380..4bfcdc0 100644
--- a/lib/SQL.cc
+++ b/lib/SQL.cc
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: SQL.cc,v 1.14 2007-06-14 14:12:20 pixel Exp $ */
+/* $Id: SQL.cc,v 1.15 2007-06-19 13:39:34 pixel Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -117,6 +117,10 @@ int SQLConnection::insertid() {
return ii;
}
+#ifdef errno
+#undef errno
+#endif
+
int SQLConnection::errno() {
return mysql_errno(con);
}