diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-25 05:05:18 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-25 05:05:18 +0000 |
commit | 2681c79d53a8f38fb6ae228ed31d989a1871eeaa (patch) | |
tree | b4f870cc805240783c975146e390cce62228a03c /channels/xpmr | |
parent | 01f16e1850a273f573b25905e5689a07f8dd71b1 (diff) |
Merged revisions 159050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r159050 | tilghman | 2008-11-24 23:02:11 -0600 (Mon, 24 Nov 2008) | 10 lines
Merged revisions 159025 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r159025 | tilghman | 2008-11-24 22:50:00 -0600 (Mon, 24 Nov 2008) | 3 lines
System call ioperm is non-portable, so check for its existence in autoconf.
(Closes issue #13863)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@159053 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/xpmr')
-rwxr-xr-x | channels/xpmr/xpmr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/xpmr/xpmr.c b/channels/xpmr/xpmr.c index 2cad653c9..c2742cbc3 100755 --- a/channels/xpmr/xpmr.c +++ b/channels/xpmr/xpmr.c @@ -56,7 +56,9 @@ #include <string.h> #include <unistd.h> #include <sys/ioctl.h> +#ifdef HAVE_SYS_IO_H #include <sys/io.h> +#endif #include <fcntl.h> #include <sys/time.h> #include <stdlib.h> |