/hg/icedtea7-forest/jdk: PR2323: System GConf without system GIO...

[andrew at icedtea.classpath.org]

changeset 4d9d165a8e7c in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=4d9d165a8e7c
author: andrew
date: Fri May 01 01:27:36 2015 +0100

	PR2323: System GConf without system GIO configuration broken
	Summary: Define types based on whether or not they are defined already, not on configuration.


diffstat:

 src/solaris/native/common/deps/glib2/glib_fp.h |  19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r 0b7452eac993 -r 4d9d165a8e7c src/solaris/native/common/deps/glib2/glib_fp.h
--- a/src/solaris/native/common/deps/glib2/glib_fp.h	Wed Apr 29 20:54:10 2015 +0100
+++ b/src/solaris/native/common/deps/glib2/glib_fp.h	Fri May 01 01:27:36 2015 +0100
@@ -27,26 +27,39 @@
 #ifndef __GLIB_FP_H__
 #define __GLIB_FP_H__
 
-#if !defined (USE_SYSTEM_GIO) && !defined (USE_SYSTEM_GCONF)
-
 #include <stdint.h>
 
+#ifndef __G_TYPES_H__
 typedef void* gpointer;
 typedef int    gint;
 typedef gint   gboolean;
 typedef char   gchar;
+#endif
+
+#ifndef __G_LIBCONFIG_H__
+#ifndef __GLIBCONFIG_H__
 typedef uint32_t guint32;
+#endif
+#endif
+
+#ifndef __G_QUARK_H__
 typedef guint32 GQuark;
+#endif
 
+#ifndef __G_ERROR_H__
 typedef struct {
   GQuark       domain;
   gint         code;
   gchar       *message;
 } GError;
+#endif
 
+#ifndef g_type_init
 #define g_type_init (*type_init)
+#endif
+
+#ifndef g_free
 #define g_free (*gfree)
-
 #endif
 
 typedef void (*type_init_func)(void);