Mercurial > hg > xemacs-beta

diff src/regex.h @ 5183:f283b08ff0c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid build failure, Apple's g++-4.0.1, Mac OS 10.4. 2010-04-02 Aidan Kehoe <kehoea@parhasard.net> Avoid build failure, Apple's g++-4.0.1, Mac OS 10.4. * sysdll.c (search_linked_libs, dll_variable): Correct some casts for the C++ build. * regex.h (END_C_DECLS, BEGIN_C_DECLS): Wrap function declarations in extern "C" { ... } on the C++ build. * mule-ccl.c (ccl_driver): Initialise i, silencing a warning on a C++ build. * keymap.c (key_desc_list_to_event): Work around a bug in Apple's g++-4.0.1.
author Aidan Kehoe <kehoea@parhasard.net>
date Fri, 02 Apr 2010 12:21:02 +0100
parents efaa6cd845e5
children 308d34e9f07d
line wrap: on
line diff
--- a/src/regex.h	Thu Apr 01 20:22:50 2010 +0100
+++ b/src/regex.h	Fri Apr 02 12:21:02 2010 +0100
@@ -42,6 +42,18 @@
 #define Bytecount ssize_t
 #endif /* emacs */
 
+#ifndef emacs
+# ifdef __cplusplus
+#  define BEGIN_C_DECLS extern "C" {
+#  define END_C_DECLS }
+# else
+#  define BEGIN_C_DECLS
+#  define END_C_DECLS
+# endif
+#endif /* emacs */
+
+BEGIN_C_DECLS
+
 /* POSIX says that <sys/types.h> must be included (by the caller) before
    <regex.h>.  */
 
@@ -535,4 +547,6 @@
 
 extern int debug_regexps;
 
+END_C_DECLS
+
 #endif /* INCLUDED_regex_h_ */