Mercurial > hg > openjdk > icedtea > jdk7 > jdk

changeset 5491:00e2703dc639

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow system GIO with in-tree GConf to work again, following previous fix.
author andrew
date Wed, 08 Aug 2012 18:26:51 +0100
parents 9e25381cbff4
children 7ef99df651ef
files make/java/net/Makefile src/solaris/native/common/deps/glib2/glib_fp.h
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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__ */