aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 ed92d4aaf..7248d37e8 100644
--- 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 4cd5657e9..aeecfdab5 100644
--- a/channels/h323/ast_h323.cxx
+++ b/channels/h323/ast_h323.cxx
@@ -29,7 +29,6 @@
* Version Info: $Id$
*/
-#include "asterisk.h"
#define VERSION(a,b,c) ((a)*10000+(b)*100+(c))
#include <arpa/inet.h>
@@ -72,6 +71,8 @@
#include "compat_h323.h"
+#include "asterisk.h"
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -83,6 +84,9 @@ extern "C" {
}
#endif
+#undef open
+#undef close
+
#include "chan_h323.h"
#include "ast_h323.h"
#include "cisco-h225.h"