Mercurial > hg > octave-nkf

diff liboctave/glob-match.h @ 9994:fdc3a43c0be8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid conflict with gnulib defining glob to be rpl_glob
author John W. Eaton <jwe@octave.org>
date Thu, 17 Dec 2009 02:38:33 -0500
parents a1dbe9d80eee
children 805a83ecd3da
line wrap: on
line diff
--- a/liboctave/glob-match.h
+++ b/liboctave/glob-match.h
@@ -71,7 +71,10 @@
 
   Array<bool> match (const string_vector&);
 
-  string_vector glob (void);
+  // We forward to glob_internal here to avoid problems with gnulib's
+  // glob.h defining glob to be rpl_glob.
+
+  string_vector glob (void) { return glob_internal (); }
 
 private:
 
@@ -80,6 +83,8 @@
 
   // Option flags.
   unsigned int flags;
+
+  string_vector glob_internal (void);
 };
 
 #endif