[Gnucash-changes] r13581 - gnucash/trunk - If <glob.h> unavailable, provide own typedef and disable globbing.

[Christian Stimming]

Author: cstim
Date: 2006-03-10 05:30:35 -0500 (Fri, 10 Mar 2006)
New Revision: 13581
Trac: http://svn.gnucash.org/trac/changeset/13581

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/gnome-utils/gnc-druid-provider-file-gnome.c
   gnucash/trunk/src/gnome-utils/gnc-druid-provider-multifile-gnome.h
Log:
If <glob.h> unavailable, provide own typedef and disable globbing.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-03-10 10:17:49 UTC (rev 13580)
+++ gnucash/trunk/ChangeLog	2006-03-10 10:30:35 UTC (rev 13581)
@@ -1,3 +1,9 @@
+2006-03-10  Christian Stimming <stimming at tuhh.de>
+
+	* src/gnome-utils/gnc-druid-provider-multifile-gnome.h,
+	gnc-druid-provider-file-gnome.c: If <glob.h> unavailable, provide
+	own typedef and disable globbing.
+
 2006-03-09  Andreas Köhler  <andi5.py at gmx.net>
 
 	* src/gnome-utils/gnc-main-window.c: Move retrieval of private

Modified: gnucash/trunk/src/gnome-utils/gnc-druid-provider-file-gnome.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-druid-provider-file-gnome.c	2006-03-10 10:17:49 UTC (rev 13580)
+++ gnucash/trunk/src/gnome-utils/gnc-druid-provider-file-gnome.c	2006-03-10 10:30:35 UTC (rev 13581)
@@ -51,7 +51,9 @@
 gnc_dpfg_end_glob(GNCDruidProviderFileGnome *prov)
 {
   if (prov->globbed) {
+#ifdef HAVE_GLOB_H
     globfree(&prov->glob);
+#endif
     prov->globbed = FALSE;
     prov->count = 0;
   }
@@ -139,7 +141,12 @@
   int err;
 
   g_assert(prov_f->globbed == FALSE);
+#ifdef HAVE_GLOB_H
   err = glob(filename, GLOB_NOCHECK, gnc_dpfg_file_err, &prov_f->glob);
+#else
+  /* glob(3) was not available. */
+  err = -1;
+#endif
   prov_f->count = 0;
 
   if (!err)

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-10 10:17:49 UTC (rev 13580)
+++ gnucash/trunk/src/gnome-utils/gnc-druid-provider-multifile-gnome.h	2006-03-10 10:30:35 UTC (rev 13581)
@@ -7,7 +7,17 @@
 //extern "C" {
 #endif
 
-#include <glob.h>
+#ifdef HAVE_GLOB_H
+# include <glob.h>
+#else
+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
+
 #include <glib.h>
 #include <glib-object.h>
 #include <libgnomeui/libgnomeui.h>