[asterisk-commits] tilghman: branch 1.6.0 r191222 - in /branches/1.6.0: ./ channels/ channels/h323/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Apr 29 18:14:51 2009
New Revision: 191222

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=191222
Log:
Merged revisions 191219 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r191219 | tilghman | 2009-04-29 18:06:56 -0500 (Wed, 29 Apr 2009) | 2 lines
  
  Make H.323 compile with FDLEAK detection code enabled
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_h323.c
    branches/1.6.0/channels/h323/ast_h323.cxx

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

Modified: branches/1.6.0/channels/chan_h323.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/channels/chan_h323.c?view=diff&rev=191222&r1=191221&r2=191222
==============================================================================
--- branches/1.6.0/channels/chan_h323.c (original)
+++ branches/1.6.0/channels/chan_h323.c Wed Apr 29 18:14:51 2009
@@ -90,6 +90,8 @@
 }
 #endif
 
+#undef open
+#undef close
 #include "h323/chan_h323.h"
 
 receive_digit_cb on_receive_digit;

Modified: branches/1.6.0/channels/h323/ast_h323.cxx
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/channels/h323/ast_h323.cxx?view=diff&rev=191222&r1=191221&r2=191222
==============================================================================
--- branches/1.6.0/channels/h323/ast_h323.cxx (original)
+++ branches/1.6.0/channels/h323/ast_h323.cxx Wed Apr 29 18:14:51 2009
@@ -28,7 +28,6 @@
  *
  * Version Info: $Id$
  */
-#include "asterisk.h"
 #define VERSION(a,b,c) ((a)*10000+(b)*100+(c))
 
 #include <arpa/inet.h>
@@ -71,6 +70,8 @@
 
 #include "compat_h323.h"
 
+#include "asterisk.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -81,6 +82,9 @@
 #ifdef __cplusplus
 }
 #endif
+
+#undef open
+#undef close
 
 #include "chan_h323.h"
 #include "ast_h323.h"