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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@191223 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index d43cca97919a78d96345aa6086972d025d4366f7..b574421841541dce0aed1a855639a3a9f8f0afb5 100644 (file)
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -90,6 +90,8 @@ extern "C" {
 }
 #endif
 
+#undef open
+#undef close
 #include "h323/chan_h323.h"
 
 receive_digit_cb on_receive_digit;

diff --git a/channels/h323/ast_h323.cxx b/channels/h323/ast_h323.cxx
index 9e9480fa4b7b1e02ad8448acd140000b101d486d..cad4c2cfce8b6251d2ab24ec28b82ca4d428dd70 100644 (file)
--- a/channels/h323/ast_h323.cxx
+++ b/channels/h323/ast_h323.cxx
@@ -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
@@ -82,6 +83,9 @@ extern "C" {
 }
 #endif
 
+#undef open
+#undef close
+
 #include "chan_h323.h"
 #include "ast_h323.h"
 #include "cisco-h225.h"