# HG changeset patch # User John W. Eaton # Date 1262941867 -3600 # Node ID cb14b3e81bd7a4b6b8d2e8b0cafc13488278de2f # Parent 6737875eb0da3c63fdba6a8f5fc44d7d31374f50 glob: Fix C++ compilation. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-01-07 John W. Eaton (tiny change) + + glob: Fix C++ compilation. + * lib/glob.in.h [__cplusplus]: Define __BEGIN_DECLS and __END_DECLS for + C++. + 2010-01-07 Bruno Haible Fix indentation of wctype.in.h, broken since 2007-01-06. diff --git a/lib/glob.in.h b/lib/glob.in.h --- a/lib/glob.in.h +++ b/lib/glob.in.h @@ -33,8 +33,13 @@ #include #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