Compile patch for GConf HEAD



Hi Havoc,
	I need the following patch for GConf to compile. Or, more correctly, I
need #include <stdint.h> for GConf to compile, but I'm fairly sure this
is not a standard header, so I added the associated configure.in junk to
detect its presence.

--
Peter Williams     peter newton cx / peterw ximian com

"Why should I have to change my name? He's the one who 
sucks!"                              -- Michael Bolton
? stdint-h.diff
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gconf/ChangeLog,v
retrieving revision 1.258
diff -u -r1.258 ChangeLog
--- ChangeLog	2001/07/04 12:37:46	1.258
+++ ChangeLog	2001/07/08 02:50:10
@@ -1,3 +1,14 @@
+2001-07-07  Peter Williams  <peter beta newton cx>
+
+	* configure.in: Check for stdint.h
+
+	* acconfig.h: Add HAVE_STDINT_H here.
+
+	* backends/bdb.h: Include stdint.h if we have it.
+
+	* backends/bdb-backend.c: Include "config.h"
+	for HAVE_STDINT_H and HAVE_DB3_DB_H
+
 2001-07-03  Michael Meeks  <michael ximian com>
 
 	* configure.in: add ORBIT_IDL check.
Index: acconfig.h
===================================================================
RCS file: /cvs/gnome/gconf/acconfig.h,v
retrieving revision 1.4
diff -u -r1.4 acconfig.h
--- acconfig.h	2001/06/01 21:29:59	1.4
+++ acconfig.h	2001/07/08 02:50:10
@@ -8,3 +8,4 @@
 #undef HAVE_PTHREAD_H
 #undef GETTEXT_PACKAGE
 #undef HAVE_DB3_DB_H
+#undef HAVE_STDINT_H
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gconf/configure.in,v
retrieving revision 1.79
diff -u -r1.79 configure.in
--- configure.in	2001/07/04 12:37:46	1.79
+++ configure.in	2001/07/08 02:50:10
@@ -170,6 +170,8 @@
 
 AC_CHECK_FUNCS(flockfile)
 
+AC_CHECK_HEADERS(stdint.h)
+
 fi # docs_only
 
 ALL_LINGUAS="az ca cs da de el es fi fr ga hu it ja ko nl no pt_BR ro ru sk sl sv tr uk"
Index: backends/bdb-backend.c
===================================================================
RCS file: /cvs/gnome/gconf/backends/bdb-backend.c,v
retrieving revision 1.2
diff -u -r1.2 bdb-backend.c
--- backends/bdb-backend.c	2000/11/03 06:50:59	1.2
+++ backends/bdb-backend.c	2001/07/08 02:50:10
@@ -20,6 +20,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/param.h>
 #include <gconf/gconf-backend.h>
 #include <gconf/gconf-internals.h>
Index: backends/bdb.h
===================================================================
RCS file: /cvs/gnome/gconf/backends/bdb.h,v
retrieving revision 1.2
diff -u -r1.2 bdb.h
--- backends/bdb.h	2001/06/01 21:30:00	1.2
+++ backends/bdb.h	2001/07/08 02:50:10
@@ -124,6 +124,10 @@
 #include <glib.h>
 #include <gconf/gconf.h>
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h> /*uint32_t*/
+#endif
+
 #define	DBD_DIR	"dir.db"
 #define	DBD_HIERARCHY	"hierarchy.db"
 #define	DBD_KEY	"key.db"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]