diff options
| author | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-11 17:31:25 +0000 |
|---|---|---|
| committer | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-11 17:31:25 +0000 |
| commit | da7f265bbc5d2fad8d8577ec5fda205a6a6dc395 (patch) | |
| tree | 0dd9c08f4d5a16f4818f3ac458b7121edada8f81 | |
| parent | 16302ff29c5b2d8da1a745d91e7a505785883118 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@74615 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/Makefile | 4 | ||||
| -rw-r--r-- | channels/chan_phone.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/channels/Makefile b/channels/Makefile index 3a2ad6871..5c448d62a 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -79,6 +79,10 @@ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard CHANNEL_LIBS+=chan_phone.so endif +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/compiler.h),) + CFLAGS+=-DHAVE_LINUX_COMPILER_H +endif + ifneq ($(wildcard h323/libchanh323.a),) CHANNEL_LIBS+=chan_h323.so endif diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 669e87507..54cadc208 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -34,6 +34,9 @@ #include <arpa/inet.h> #include <fcntl.h> #include <sys/ioctl.h> +#ifdef HAVE_LINUX_COMPILER_H +#include <linux/compiler.h> +#endif #include <linux/telephony.h> /* Still use some IXJ specific stuff */ #include <linux/version.h> |