[Gnucash-changes] r13629 - gnucash/trunk - Improve include order so that building without <glob.h> is possible.

[Christian Stimming]

Author: cstim
Date: 2006-03-14 05:23:44 -0500 (Tue, 14 Mar 2006)
New Revision: 13629
Trac: http://svn.gnucash.org/trac/changeset/13629

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/gnome-utils/gnc-druid-provider-file-gnome.h
   gnucash/trunk/src/gnome-utils/gnc-druid-provider-multifile-gnome.c
   gnucash/trunk/src/gnome-utils/gnc-druid-provider-multifile-gnome.h
Log:
Improve include order so that building without <glob.h> is possible.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-03-14 10:19:55 UTC (rev 13628)
+++ gnucash/trunk/ChangeLog	2006-03-14 10:23:44 UTC (rev 13629)
@@ -1,3 +1,8 @@
+2006-03-14  Christian Stimming <stimming at tuhh.de>
+
+	* src/gnome-utils/gnc-druid-provider-multifile-gnome.h: Improve
+	include order so that building without <glob.h> is possible.
+
 2006-03-14  David Hampton  <hampton at employees.org>
 
 	* src/gnome-utils/gnc-tree-view-account.c:

Modified: gnucash/trunk/src/gnome-utils/gnc-druid-provider-file-gnome.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-druid-provider-file-gnome.h	2006-03-14 10:19:55 UTC (rev 13628)
+++ gnucash/trunk/src/gnome-utils/gnc-druid-provider-file-gnome.h	2006-03-14 10:23:44 UTC (rev 13629)
@@ -10,6 +10,7 @@
 #ifdef HAVE_GLOB_H
 # include <glob.h>
 #else
+# include <stddef.h> /* for size_t */
 typedef struct
 {
   size_t gl_pathc;    /* Count of paths matched so far  */

Modified: gnucash/trunk/src/gnome-utils/gnc-druid-provider-multifile-gnome.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-druid-provider-multifile-gnome.c	2006-03-14 10:19:55 UTC (rev 13628)
+++ gnucash/trunk/src/gnome-utils/gnc-druid-provider-multifile-gnome.c	2006-03-14 10:23:44 UTC (rev 13629)
@@ -2,9 +2,9 @@
 
 #include "config.h"
 #include "gnc-druid-gnome-ui.h"
+#include "gnc-druid-provider-file-gnome.h"
 #include "gnc-druid-provider-multifile-gnome.h"
 #include "gnc-druid-provider-desc-multifile.h"
-#include "gnc-druid-provider-file-gnome.h"
 
 #include "gnc-basic-gobject.h"
 #include "dialog-utils.h"

Modified: gnucash/trunk/src/gnome-utils/gnc-druid-provider-multifile-gnome.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-druid-provider-multifile-gnome.h	2006-03-14 10:19:55 UTC (rev 13628)
+++ gnucash/trunk/src/gnome-utils/gnc-druid-provider-multifile-gnome.h	2006-03-14 10:23:44 UTC (rev 13629)
@@ -10,12 +10,15 @@
 #ifdef HAVE_GLOB_H
 # include <glob.h>
 #else
+# ifndef GNC_DRUID_PROVIDER_FILE_GNOME_H
+#  include <stddef.h> /* for size_t */
 typedef struct
 {
   size_t gl_pathc;    /* Count of paths matched so far  */
   char **gl_pathv;    /* List of matched pathnames.  */
   size_t gl_offs;     /* Slots to reserve in `gl_pathv'.  */
 } glob_t;
+# endif
 #endif
 
 #include <glib.h>