aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-04-30 08:47:47 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-04-30 08:47:47 +0000
commit760c81788e798c2e4dedcd7ebd108c65f3194775 (patch)
tree2ccd9459cd1bf978a37eabfed42a21bb170082e6
parent298249eb17e31c56c37214a3210f909c129a7ee7 (diff)
remove T38_SUPPORT define that is no longer needed
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@23536 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--asterisk.c4
-rw-r--r--build_tools/cflags.xml3
-rw-r--r--channel.c2
-rw-r--r--include/asterisk/frame.h4
4 files changed, 0 insertions, 13 deletions
diff --git a/asterisk.c b/asterisk.c
index bb4090649..93f6af8ef 100644
--- a/asterisk.c
+++ b/asterisk.c
@@ -111,9 +111,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/enum.h"
#include "asterisk/rtp.h"
#include "asterisk/http.h"
-#if defined(T38_SUPPORT)
#include "asterisk/udptl.h"
-#endif
#include "asterisk/app.h"
#include "asterisk/lock.h"
#include "asterisk/utils.h"
@@ -2582,9 +2580,7 @@ int main(int argc, char *argv[])
exit(1);
}
ast_rtp_init();
-#if defined(T38_SUPPORT)
ast_udptl_init();
-#endif
if (ast_image_init()) {
printf(term_quit());
exit(1);
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index 3bb1393f4..af8077ff1 100644
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -17,7 +17,4 @@
</member>
<member name="-DMTX_PROFILE">
</member>
- <member name="-DT38_SUPPORT">
- <defaultenabled>yes</defaultenabled>
- </member>
</category>
diff --git a/channel.c b/channel.c
index 6a8def8a3..aba97cf7f 100644
--- a/channel.c
+++ b/channel.c
@@ -3330,9 +3330,7 @@ static enum ast_bridge_result ast_generic_bridge(struct ast_channel *c0, struct
(f->frametype == AST_FRAME_VIDEO) ||
(f->frametype == AST_FRAME_IMAGE) ||
(f->frametype == AST_FRAME_HTML) ||
-#if defined(T38_SUPPORT)
(f->frametype == AST_FRAME_MODEM) ||
-#endif
(f->frametype == AST_FRAME_TEXT)) {
/* monitored dtmf causes exit from bridge */
int monitored_source = (who == c0) ? watch_c0_dtmf : watch_c1_dtmf;
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index dd1a41732..b70b7bcd2 100644
--- a/include/asterisk/frame.h
+++ b/include/asterisk/frame.h
@@ -164,22 +164,18 @@ extern struct ast_frame ast_null_frame;
/*! Comfort Noise frame (subclass is level of CNG in -dBov),
body may include zero or more 8-bit quantization coefficients */
#define AST_FRAME_CNG 10
-#if defined(T38_SUPPORT)
/*! Modem-over-IP data streams */
#define AST_FRAME_MODEM 11
-#endif /* T38_SUPPORT */
/*! DTMF begin event, subclass is the digit */
#define AST_FRAME_DTMF_BEGIN 12
/*! DTMF end event, subclass is the digit */
#define AST_FRAME_DTMF_END 13
-#if defined(T38_SUPPORT)
/* MODEM subclasses */
/*! T.38 Fax-over-IP */
#define AST_MODEM_T38 1
/*! V.150 Modem-over-IP */
#define AST_MODEM_V150 2
-#endif /* T38_SUPPORT */
/* HTML subclasses */
/*! Sending a URL */