From: John W. Eaton <jwe@octave.org>
Date: Fri, 8 Jan 2010 09:11:07 +0000 (+0100)
Subject: glob: Fix C++ compilation.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0906b5f3d776d1a91b4c1f2c244cb01b2c6aabcd;p=pspp

glob: Fix C++ compilation.
---

diff --git a/ChangeLog b/ChangeLog
index 18ca2b110f..bd5565b6ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-07  John W. Eaton  <jwe@octave.org>  (tiny change)
+
+	glob: Fix C++ compilation.
+	* lib/glob.in.h [__cplusplus]: Define __BEGIN_DECLS and __END_DECLS for
+	C++.
+
 2010-01-07  Bruno Haible  <bruno@clisp.org>
 
 	Fix indentation of wctype.in.h, broken since 2007-01-06.
diff --git a/lib/glob.in.h b/lib/glob.in.h
index 562f1c52d2..8f32a79290 100644
--- a/lib/glob.in.h
+++ b/lib/glob.in.h
@@ -33,8 +33,13 @@
 #include <sys/stat.h>
 
 #ifndef __BEGIN_DECLS
-# define __BEGIN_DECLS
-# define __END_DECLS
+# ifdef __cplusplus
+#  define __BEGIN_DECLS  extern "C" {
+#  define __END_DECLS    }
+# else
+#  define __BEGIN_DECLS
+#  define __END_DECLS
+# endif
 #endif
 #ifndef __THROW
 # define __THROW