aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-04-29 23:10:54 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-04-29 23:10:54 +0000
commit96d67c9f1667d3ebe04cdebb05b4db72bf884542 (patch)
tree4297f30c978079e412d0dcc61f86d39656dd7c4b
parent33753b592f15a7c3f7d9d058c77e757939e2845c (diff)
Allow H.323 to compile with FDLEAK checking enabled.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@191220 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_h323.c2
-rw-r--r--channels/h323/ast_h323.cxx6
2 files changed, 7 insertions, 1 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 6125822dc..40935acbc 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -102,6 +102,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 6c8b39d55..bec0c4ab8 100644
--- a/channels/h323/ast_h323.cxx
+++ b/channels/h323/ast_h323.cxx
@@ -25,7 +25,6 @@
*
* Version Info: $Id$
*/
-#include "asterisk.h"
#define VERSION(a,b,c) ((a)*10000+(b)*100+(c))
@@ -70,6 +69,8 @@
#include "compat_h323.h"
+#include "asterisk.h"
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -80,6 +81,9 @@ extern "C" {
}
#endif
+#undef open
+#undef close
+
#include "chan_h323.h"
#include "ast_h323.h"
#include "cisco-h225.h"