Gentoo Linux -- List Archive: gentoo-commits

Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647

List Archive: gentoo-commits

Navigation:

Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >

Headers:

To:	gentoo-commits@g.o
From:	"Steve Arnold (nerdboy)" <nerdboy@g.o>
Subject:	gentoo-x86 commit in sci-libs/gdal/files: gdal-1.6.0-mysql_ogr_header.patch
Date:	Sat, 01 Aug 2009 16:56:10 +0000

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

Navigation:

Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >

Previous by thread:

gentoo-x86 commit in media-plugins/live: ChangeLog live-2009.07.28.ebuild

Next by thread:

gentoo-x86 commit in sci-libs/gdal: ChangeLog gdal-1.6.0-r1.ebuild

Previous by date:

gentoo-x86 commit in x11-base/xorg-server: ChangeLog xorg-server-1.5.3-r6.ebuild

Next by date:

gentoo-x86 commit in sci-libs/gdal: ChangeLog gdal-1.6.0-r1.ebuild

Updated Jun 26, 2012

Summary: Archive of the gentoo-commits mailing list.

Donate to support our development efforts.