[asterisk-commits] tilghman: branch 1.6.0 r213561 - in /branches/1.6.0: ./ include/asterisk.h

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Aug 21 11:55:12 2009
New Revision: 213561

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=213561
Log:
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
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk.h

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/include/asterisk.h
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/include/asterisk.h?view=diff&rev=213561&r1=213560&r2=213561
==============================================================================
--- branches/1.6.0/include/asterisk.h (original)
+++ branches/1.6.0/include/asterisk.h Fri Aug 21 11:55:12 2009
@@ -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 @@
 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 */