diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-29 23:15:03 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-29 23:15:03 +0000 |
| commit | 076caea32534c9e6ee7cb471c102636e9e6847fc (patch) | |
| tree | bf55a1f206761b08b87aacb925a17ec9902c1d1f /channels | |
| parent | e697db7758a253faa5af39777cd71b188cf14ea8 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@191224 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_h323.c | 2 | ||||
| -rw-r--r-- | channels/h323/ast_h323.cxx | 6 |
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" |