[Thuban-commits] r2675 - in trunk/thuban: . libraries/thuban

[scm-commit@wald.intevation.org]

Author: bernhard
Date: 2006-03-29 12:58:44 +0200 (Wed, 29 Mar 2006)
New Revision: 2675

Modified:
   trunk/thuban/ChangeLog
   trunk/thuban/libraries/thuban/wxproj.cpp
Log:
undef LP to avoid clash when trying to build with mingw.


Modified: trunk/thuban/ChangeLog
===================================================================
--- trunk/thuban/ChangeLog	2005-10-19 08:56:47 UTC (rev 2674)
+++ trunk/thuban/ChangeLog	2006-03-29 10:58:44 UTC (rev 2675)
@@ -1,3 +1,7 @@
+2006-03-29  Bernhard Reiter <bernhard at intevation.de>
+	* libraries/thuban/wxproj.cpp: undef LP to avoid clash when 
+	trying to build with mingw.
+
 2005-10-18  Bernhard Reiter <bernhard at intevation.de>
 
 	* Thuban/UI/about.py: remove unused import of getdefaultlocale.

Modified: trunk/thuban/libraries/thuban/wxproj.cpp
===================================================================
--- trunk/thuban/libraries/thuban/wxproj.cpp	2005-10-19 08:56:47 UTC (rev 2674)
+++ trunk/thuban/libraries/thuban/wxproj.cpp	2006-03-29 10:58:44 UTC (rev 2675)
@@ -28,6 +28,11 @@
 /* undefine it again */
 #undef PVALUE
 
+/* projects.h has a #define for LP.
+ * LP is also used in a typedef in winnt.h by mingw/w32api-3.6
+ * so we undefine it here to avoid the clash. */
+#undef LP
+
 #include <wx/wx.h>