comparison src/regex.h @ 5183:f283b08ff0c9

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
comparison
equal deleted inserted replaced
5182:2e528066e2fc 5183:f283b08ff0c9
39 #define RE_LISP_CONTEXT_ARGS_MULE_DECL 39 #define RE_LISP_CONTEXT_ARGS_MULE_DECL
40 #define RE_LISP_CONTEXT_ARGS 40 #define RE_LISP_CONTEXT_ARGS
41 #define Elemcount ssize_t 41 #define Elemcount ssize_t
42 #define Bytecount ssize_t 42 #define Bytecount ssize_t
43 #endif /* emacs */ 43 #endif /* emacs */
44
45 #ifndef emacs
46 # ifdef __cplusplus
47 # define BEGIN_C_DECLS extern "C" {
48 # define END_C_DECLS }
49 # else
50 # define BEGIN_C_DECLS
51 # define END_C_DECLS
52 # endif
53 #endif /* emacs */
54
55 BEGIN_C_DECLS
44 56
45 /* POSIX says that <sys/types.h> must be included (by the caller) before 57 /* POSIX says that <sys/types.h> must be included (by the caller) before
46 <regex.h>. */ 58 <regex.h>. */
47 59
48 60
533 RE_DEBUG_MATCHING = 1 << 2, 545 RE_DEBUG_MATCHING = 1 << 2,
534 }; 546 };
535 547
536 extern int debug_regexps; 548 extern int debug_regexps;
537 549
550 END_C_DECLS
551
538 #endif /* INCLUDED_regex_h_ */ 552 #endif /* INCLUDED_regex_h_ */