Gentoo Archives: gentoo-commits

From: "Steve Arnold (nerdboy)" <nerdboy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/gdal/files: gdal-1.6.0-mysql_ogr_header.patch
Date: Sat, 01 Aug 2009 16:56:12
Message-Id: E1MXHsQ-0001ci-W8@stork.gentoo.org
nerdboy     09/08/01 16:56:10

  Added:                gdal-1.6.0-mysql_ogr_header.patch
  Log:
  Added patch for mysql header conflict (fixed in upstream trunk).
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-libs/gdal/files/gdal-1.6.0-mysql_ogr_header.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/files/gdal-1.6.0-mysql_ogr_header.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/files/gdal-1.6.0-mysql_ogr_header.patch?rev=1.1&content-type=text/plain

Index: gdal-1.6.0-mysql_ogr_header.patch
===================================================================
Index: /trunk/gdal/ogr/ogrsf_frmts/mysql/ogr_mysql.h
===================================================================
--- /trunk/gdal/ogr/ogrsf_frmts/mysql/ogr_mysql.h (revision 15583)
+++ /trunk/gdal/ogr/ogrsf_frmts/mysql/ogr_mysql.h (revision 16921)
@@ -35,4 +35,14 @@
 #include <mysql.h>
 
+/* my_global.h from mysql 5.1 declares the min and max macros. */
+/* This conflicts with templates in g++-4.3.2 header files. Grrr */
+#ifdef min
+#undef min
+#endif
+
+#ifdef max
+#undef max
+#endif
+
 #ifdef bool
 #undef bool