[asterisk-commits] file: branch 1.2 r74587 - in /branches/1.2/channels: Makefile chan_phone.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed Jul 11 12:15:11 2007
New Revision: 74587

URL: http://svn.digium.com/view/asterisk?view=rev&rev=74587
Log:
Use some Makefile magic to determine if linux/compiler.h is present. (issue #10174 reported by francesco_r)

Modified:
    branches/1.2/channels/Makefile
    branches/1.2/channels/chan_phone.c

Modified: branches/1.2/channels/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/Makefile?view=diff&rev=74587&r1=74586&r2=74587
==============================================================================
--- branches/1.2/channels/Makefile (original)
+++ branches/1.2/channels/Makefile Wed Jul 11 12:15:11 2007
@@ -77,6 +77,10 @@
 
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
   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),)

Modified: branches/1.2/channels/chan_phone.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_phone.c?view=diff&rev=74587&r1=74586&r2=74587
==============================================================================
--- branches/1.2/channels/chan_phone.c (original)
+++ branches/1.2/channels/chan_phone.c Wed Jul 11 12:15:11 2007
@@ -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>