From: Tilghman Lesher Date: Fri, 21 Aug 2009 16:55:20 +0000 (+0000) Subject: Merged revisions 213560 via svnmerge from X-Git-Tag: 1.6.1.7-rc1~91 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae45fbe3ca352f1c7714b402e1cabe2eb0e54de1;p=thirdparty%2Fasterisk.git Merged revisions 213560 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r213560 | tilghman | 2009-08-21 11:53:52 -0500 (Fri, 21 Aug 2009) | 14 lines Merged revisions 213559 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r213559 | tilghman | 2009-08-21 11:52:53 -0500 (Fri, 21 Aug 2009) | 7 lines Permit DEBUG_FD_LEAKS to be used with C++ source files. (closes issue #15698) Reported by: slavon Patches: 20090817__issue15698.diff.txt uploaded by tilghman (license 14) Tested by: slavon, tilghman ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@213562 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/include/asterisk.h b/include/asterisk.h index 774147fde1..177f452769 100644 --- a/include/asterisk.h +++ b/include/asterisk.h @@ -61,6 +61,9 @@ #define dup2(a,b) __ast_fdleak_dup2(a, b, __FILE__,__LINE__,__PRETTY_FUNCTION__) #define dup(a) __ast_fdleak_dup(a, __FILE__,__LINE__,__PRETTY_FUNCTION__) +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif int __ast_fdleak_open(const char *file, int line, const char *func, const char *path, int flags, ...); int __ast_fdleak_pipe(int *fds, const char *file, int line, const char *func); int __ast_fdleak_socket(int domain, int type, int protocol, const char *file, int line, const char *func); @@ -69,6 +72,9 @@ FILE *__ast_fdleak_fopen(const char *path, const char *mode, const char *file, i int __ast_fdleak_fclose(FILE *ptr); int __ast_fdleak_dup2(int oldfd, int newfd, const char *file, int line, const char *func); int __ast_fdleak_dup(int oldfd, const char *file, int line, const char *func); +#if defined(__cplusplus) || defined(c_plusplus) +} +#endif #endif int ast_set_priority(int); /*!< Provided by asterisk.c */