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`

1	nerdboy 09/08/01 16:56:10
2
3	Added: gdal-1.6.0-mysql_ogr_header.patch
4	Log:
5	Added patch for mysql header conflict (fixed in upstream trunk).
6	(Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8	Revision Changes Path
9	1.1 sci-libs/gdal/files/gdal-1.6.0-mysql_ogr_header.patch
10
11	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
12	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
13
14	Index: gdal-1.6.0-mysql_ogr_header.patch
15	===================================================================
16	Index: /trunk/gdal/ogr/ogrsf_frmts/mysql/ogr_mysql.h
17	===================================================================
18	--- /trunk/gdal/ogr/ogrsf_frmts/mysql/ogr_mysql.h (revision 15583)
19	+++ /trunk/gdal/ogr/ogrsf_frmts/mysql/ogr_mysql.h (revision 16921)
20	@@ -35,4 +35,14 @@
21	#include <mysql.h>
22
23	+/* my_global.h from mysql 5.1 declares the min and max macros. */
24	+/* This conflicts with templates in g++-4.3.2 header files. Grrr */
25	+#ifdef min
26	+#undef min
27	+#endif
28	+
29	+#ifdef max
30	+#undef max
31	+#endif
32	+
33	#ifdef bool
34	#undef bool