[svn-commits] tilghman: trunk r252980 - in /trunk: ./ include/asterisk/ tests/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Mar 16 19:14:32 CDT 2010
Author: tilghman
Date: Tue Mar 16 19:14:29 2010
New Revision: 252980
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=252980
Log:
Fix bamboo compile error by calculating an integer with the same size as a pointer.
Modified:
trunk/configure
trunk/configure.ac
trunk/include/asterisk/autoconfig.h.in
trunk/tests/test_gosub.c
Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=252980&r1=252979&r2=252980
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Mar 16 19:14:29 2010
@@ -780,7 +780,10 @@
AC_CHECK_HEADER([libkern/OSAtomic.h],
[AC_DEFINE_UNQUOTED([HAVE_OSX_ATOMICS], 1, [Define to 1 if OSX atomic operations are supported.])])
-AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF([int])
+AC_CHECK_SIZEOF([long])
+AC_CHECK_SIZEOF([long long])
+AC_CHECK_SIZEOF([char *])
# do the package library checks now
Modified: trunk/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/autoconfig.h.in?view=diff&rev=252980&r1=252979&r2=252980
==============================================================================
--- trunk/include/asterisk/autoconfig.h.in (original)
+++ trunk/include/asterisk/autoconfig.h.in Tue Mar 16 19:14:29 2010
@@ -950,7 +950,7 @@
/* Define to 1 if you have the `strtoq' function. */
#undef HAVE_STRTOQ
-/* Define to 1 if `struct stat' is a member of `st_blksize'. */
+/* Define to 1 if `st_blksize' is member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
/* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1281,11 +1281,11 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+
+/* Define to 1 if the C compiler supports function prototypes. */
+#undef PROTOTYPES
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@@ -1306,8 +1306,22 @@
/* Define to the type of arg 5 for `select'. */
#undef SELECT_TYPE_ARG5
+/* Define to 1 if the `setvbuf' function takes the buffering type as its
+ second argument and the buffer pointer as the third, as on System V before
+ release 3. */
+#undef SETVBUF_REVERSED
+
+/* The size of `char *', as computed by sizeof. */
+#undef SIZEOF_CHAR_P
+
/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
+
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* The size of `long long', as computed by sizeof. */
+#undef SIZEOF_LONG_LONG
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
@@ -1326,46 +1340,50 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
-/* Enable extensions on AIX 3, Interix. */
+/* Define to 1 if on AIX 3.
+ System headers sometimes define this.
+ We just want to avoid a redefinition error message. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
-/* Enable threading extensions on Solaris. */
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+#undef _LARGEFILE_SOURCE
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+ this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Enable extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
-/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
-/* Enable general extensions on Solaris. */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#undef _LARGEFILE_SOURCE
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
- this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
+
+/* Define like PROTOTYPES; this can be used by system headers. */
+#undef __PROTOTYPES
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
Modified: trunk/tests/test_gosub.c
URL: http://svnview.digium.com/svn/asterisk/trunk/tests/test_gosub.c?view=diff&rev=252980&r1=252979&r2=252980
==============================================================================
--- trunk/tests/test_gosub.c (original)
+++ trunk/tests/test_gosub.c Tue Mar 16 19:14:29 2010
@@ -37,6 +37,16 @@
#include "asterisk/module.h"
#include "asterisk/test.h"
#include "asterisk/pbx.h"
+
+#if SIZEOF_INT == SIZEOF_CHAR_P
+#define compat_int int
+#elif SIZEOF_LONG == SIZEOF_CHAR_P
+#define compat_int long
+#elif SIZEOF_LONG_LONG == SIZEOF_CHAR_P
+#define compat_int long long
+#else
+#error "Cannot find an integer type the same size as a pointer"
+#endif
AST_TEST_DEFINE(test_gosub)
{
@@ -125,7 +135,7 @@
}
} else {
/* Run application */
- int exec_res;
+ compat_int exec_res;
struct ast_app *app = pbx_findapp(testplan[i].app);
if (!app) {
ast_test_status_update(test, "Could not find '%s' in application listing!\n", testplan[i].app);
More information about the svn-commits
mailing list