gtkhtml r8696 - trunk/gtkhtml

[tml svn gnome org]

Author: tml
Date: Wed Jan 23 01:28:11 2008
New Revision: 8696
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8696&view=rev

Log:
2008-01-23  Tor Lillqvist  <tml novell com>

	* testgtkhtml.c: #undef DATADIR on Windows do avoid clash.



Modified:
   trunk/gtkhtml/ChangeLog
   trunk/gtkhtml/testgtkhtml.c

Modified: trunk/gtkhtml/testgtkhtml.c
==============================================================================
--- trunk/gtkhtml/testgtkhtml.c	(original)
+++ trunk/gtkhtml/testgtkhtml.c	Wed Jan 23 01:28:11 2008
@@ -31,6 +31,11 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkbutton.h>
 
+#ifdef G_OS_WIN32
+/* Clashes with objidl.h, which gets included through a chain of includes from libsoup/soup.h */
+#undef DATADIR			
+#endif
+
 #include <libsoup/soup.h>
 #include <sys/stat.h>
 #include <fcntl.h>