# HG changeset patch
# User andrew
# Date 1344446811 -3600
# Node ID 00e2703dc63935303f6cad65a7996037a30babd5
# Parent  9e25381cbff4af23390770fc7ecd9e9a05cd7293
Allow system GIO with in-tree GConf to work again, following previous fix.

diff -r 9e25381cbff4 -r 00e2703dc639 make/java/net/Makefile
--- a/make/java/net/Makefile	Mon Aug 06 14:20:32 2012 +0100
+++ b/make/java/net/Makefile	Wed Aug 08 18:26:51 2012 +0100
@@ -121,7 +121,7 @@
   OTHER_LDLIBS += $(GCONF_LIBS) $(GOBJECT_LIBS)
   CPPFLAGS += $(GCONF_CFLAGS) $(GOBJECT_CFLAGS) -DUSE_SYSTEM_GCONF
 else
-  CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/gconf2
+  CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/gconf2 -I$(PLATFORM_SRC)/native/common/deps/glib2
   OTHER_LDLIBS += $(LIBDL)
 endif
 
diff -r 9e25381cbff4 -r 00e2703dc639 src/solaris/native/common/deps/glib2/glib_fp.h
--- a/src/solaris/native/common/deps/glib2/glib_fp.h	Mon Aug 06 14:20:32 2012 +0100
+++ b/src/solaris/native/common/deps/glib2/glib_fp.h	Wed Aug 08 18:26:51 2012 +0100
@@ -33,7 +33,9 @@
 extern type_init_func type_init;
 extern free_func gfree;
 
+#ifndef USE_SYSTEM_GIO
 #define g_type_init (*type_init)
 #define g_free (*gfree)
+#endif
 
 #endif /* __GLIB_FP_H__ */