glom r1643 - in trunk: . glom/libglom

[arminb svn gnome org]

Author: arminb
Date: Sun Jul 20 18:08:19 2008
New Revision: 1643
URL: http://svn.gnome.org/viewvc/glom?rev=1643&view=rev

Log:
2008-07-20  Armin Burgmeier  <armin openismus com>

	* glom/libglom/connectionpool.cc: Windows build fix: winsock2.h
	somehow includes a file that defines a structure called DATADIR, but
	DATADIR is a define glom uses, which breaks the build. Fixed by
	#undefining DATADIR for that include.


Modified:
   trunk/ChangeLog
   trunk/glom/libglom/connectionpool.cc

Modified: trunk/glom/libglom/connectionpool.cc
==============================================================================
--- trunk/glom/libglom/connectionpool.cc	(original)
+++ trunk/glom/libglom/connectionpool.cc	Sun Jul 20 18:08:19 2008
@@ -51,7 +51,13 @@
 
 #include <netinet/in.h> //For sockaddr_in
 #else
+
+// This includes objidl.h which has a structure called DATADIR. This fails to
+// compile with the DATADIR define, so undef it for the inclusion.
+#define GLOM_SAVE_DATADIR DATADIR
+#undef DATADIR
 #include <winsock2.h>
+#define DATADIR GLOM_SAVE_DATADIR
 #endif
 
 #include <signal.h> //To catch segfaults