[asterisk-commits] tilghman: branch 1.6.1 r159053 - in /branches/1.6.1: ./ apps/ channels/ chann...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Nov 24 23:05:19 CST 2008
Author: tilghman
Date: Mon Nov 24 23:05:18 2008
New Revision: 159053
URL: http://svn.digium.com/view/asterisk?view=rev&rev=159053
Log:
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)
........
................
Modified:
branches/1.6.1/ (props changed)
branches/1.6.1/apps/app_rpt.c
branches/1.6.1/channels/chan_usbradio.c
branches/1.6.1/channels/xpmr/xpmr.c
branches/1.6.1/configure
branches/1.6.1/configure.ac
branches/1.6.1/include/asterisk/autoconfig.h.in
Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.1/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_rpt.c?view=diff&rev=159053&r1=159052&r2=159053
==============================================================================
--- branches/1.6.1/apps/app_rpt.c (original)
+++ branches/1.6.1/apps/app_rpt.c Mon Nov 24 23:05:18 2008
@@ -331,7 +331,9 @@
#include <sys/time.h>
#include <sys/file.h>
#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IO_H
#include <sys/io.h>
+#endif
#include <sys/vfs.h>
#include <math.h>
#include <dahdi/user.h>
@@ -4483,6 +4485,7 @@
{
res = set_ic706(myrpt);
}
+#ifdef HAVE_IOPERM
else if(!strcmp(myrpt->remoterig, remote_rig_rbi)||!strcmp(myrpt->remoterig, remote_rig_ppp16))
{
if (ioperm(myrpt->p.iobase,1,1) == -1)
@@ -4493,6 +4496,7 @@
}
else res = setrbi(myrpt);
}
+#endif
else if(!strcmp(myrpt->remoterig, remote_rig_kenwood))
{
if (myrpt->iofd >= 0) setdtr(myrpt->iofd,1);
@@ -10756,7 +10760,8 @@
rpt_mutex_unlock(&myrpt->lock);
usleep(100000);
rpt_mutex_lock(&myrpt->lock);
- }
+ }
+#ifdef HAVE_IOPERM
if ((!strcmp(myrpt->remoterig, remote_rig_rbi)) &&
(ioperm(myrpt->p.iobase,1,1) == -1))
{
@@ -10765,6 +10770,7 @@
myrpt->rpt_thread = AST_PTHREADT_STOP;
pthread_exit(NULL);
}
+#endif
strncpy(tmpstr,myrpt->rxchanname,sizeof(tmpstr) - 1);
tele = strchr(tmpstr,'/');
if (!tele)
@@ -13721,6 +13727,7 @@
}
}
+#ifdef HAVE_IOPERM
if ( (!strcmp(myrpt->remoterig, remote_rig_rbi)||!strcmp(myrpt->remoterig, remote_rig_ppp16)) &&
(ioperm(myrpt->p.iobase,1,1) == -1))
{
@@ -13728,6 +13735,7 @@
ast_log(LOG_WARNING, "Can't get io permission on IO port %x hex\n",myrpt->p.iobase);
return -1;
}
+#endif
myrpt->remoteon = 1;
#ifdef OLD_ASTERISK
LOCAL_USER_ADD(u);
Modified: branches/1.6.1/channels/chan_usbradio.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_usbradio.c?view=diff&rev=159053&r1=159052&r2=159053
==============================================================================
--- branches/1.6.1/channels/chan_usbradio.c (original)
+++ branches/1.6.1/channels/chan_usbradio.c Mon Nov 24 23:05:18 2008
@@ -63,7 +63,9 @@
#include <math.h>
#include <string.h>
#include <unistd.h>
+#ifdef HAVE_SYS_IO_H
#include <sys/io.h>
+#endif
#include <sys/ioctl.h>
#include <fcntl.h>
#include <sys/time.h>
Modified: branches/1.6.1/channels/xpmr/xpmr.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/xpmr/xpmr.c?view=diff&rev=159053&r1=159052&r2=159053
==============================================================================
--- branches/1.6.1/channels/xpmr/xpmr.c (original)
+++ branches/1.6.1/channels/xpmr/xpmr.c Mon Nov 24 23:05:18 2008
@@ -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>
Modified: branches/1.6.1/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/configure.ac?view=diff&rev=159053&r1=159052&r2=159053
==============================================================================
--- branches/1.6.1/configure.ac (original)
+++ branches/1.6.1/configure.ac Mon Nov 24 23:05:18 2008
@@ -275,7 +275,7 @@
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h arpa/nameser.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h arpa/nameser.h sys/io.h])
AC_CHECK_HEADERS([winsock.h winsock2.h])
@@ -319,7 +319,7 @@
AC_FUNC_STRTOD
AC_FUNC_UTIME_NULL
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([asprintf atexit dup2 endpwent ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtol strtoq unsetenv utime vasprintf])
+AC_CHECK_FUNCS([asprintf atexit dup2 endpwent ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday ioperm inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtol strtoq unsetenv utime vasprintf])
AC_CHECK_FUNCS([glob])
Modified: branches/1.6.1/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/include/asterisk/autoconfig.h.in?view=diff&rev=159053&r1=159052&r2=159053
==============================================================================
--- branches/1.6.1/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.1/include/asterisk/autoconfig.h.in Mon Nov 24 23:05:18 2008
@@ -377,6 +377,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
+/* Define to 1 if you have the `ioperm' function. */
+#undef HAVE_IOPERM
+
/* Define if your system has the IP_MTU_DISCOVER headers. */
#undef HAVE_IP_MTU_DISCOVER
@@ -929,6 +932,9 @@
/* Define to 1 if you have the <sys/ioctl.h> header file. */
#undef HAVE_SYS_IOCTL_H
+
+/* Define to 1 if you have the <sys/io.h> header file. */
+#undef HAVE_SYS_IO_H
/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
*/
More information about the asterisk-commits
mailing list