[asterisk-commits] tilghman: trunk r217638 - in /trunk: ./ include/asterisk/ res/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Sep 10 13:17:19 CDT 2009
Author: tilghman
Date: Thu Sep 10 13:17:14 2009
New Revision: 217638
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=217638
Log:
Verify support for wide ODBC character types before using them.
(closes issue #15870)
Reported by: nic_bellamy
Modified:
trunk/configure
trunk/configure.ac
trunk/include/asterisk/autoconfig.h.in
trunk/res/res_config_odbc.c
Modified: trunk/configure.ac
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/configure.ac?view=diff&rev=217638&r1=217637&r2=217638
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Sep 10 13:17:14 2009
@@ -1653,6 +1653,20 @@
fi
AC_SUBST(EDITLINE_LIB)
+if test "x${PBX_UNIXODBC}" = "x1" -o "x${PBX_IODBC}" = "x1"; then
+ # Does ODBC support wide characters?
+ AC_MSG_CHECKING(whether ODBC has support for Unicode types)
+ AC_LINK_IFELSE(
+ AC_LANG_PROGRAM(
+ [#include <sql.h>
+#include <sqlext.h>],
+ [int foo = SQL_WCHAR]),
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_ODBC_WCHAR], [1], [Define to 1 if your ODBC library has wide (Unicode) types.]),
+ AC_MSG_RESULT(no)
+ )
+fi
+
AC_CHECK_HEADER([h323.h], [PBX_H323=1], [PBX_H323=0])
AC_SUBST(PBX_H323)
Modified: trunk/include/asterisk/autoconfig.h.in
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/include/asterisk/autoconfig.h.in?view=diff&rev=217638&r1=217637&r2=217638
==============================================================================
--- trunk/include/asterisk/autoconfig.h.in (original)
+++ trunk/include/asterisk/autoconfig.h.in Thu Sep 10 13:17:14 2009
@@ -572,6 +572,9 @@
/* Define to the version of the newt library. */
#undef HAVE_NEWT_VERSION
+/* Define to 1 if your ODBC library has wide (Unicode) types. */
+#undef HAVE_ODBC_WCHAR
+
/* Define to 1 if you have the OGG library. */
#undef HAVE_OGG
@@ -1246,6 +1249,9 @@
/* 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. */
#undef PTHREAD_CREATE_JOINABLE
@@ -1261,6 +1267,11 @@
/* 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 `int', as computed by sizeof. */
#undef SIZEOF_INT
@@ -1282,46 +1293,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/res/res_config_odbc.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/res/res_config_odbc.c?view=diff&rev=217638&r1=217637&r2=217638
==============================================================================
--- trunk/res/res_config_odbc.c (original)
+++ trunk/res/res_config_odbc.c Thu Sep 10 13:17:14 2009
@@ -903,9 +903,11 @@
case SQL_CHAR:
case SQL_VARCHAR:
case SQL_LONGVARCHAR:
+#ifdef HAVE_ODBC_WCHAR
case SQL_WCHAR:
case SQL_WVARCHAR:
case SQL_WLONGVARCHAR:
+#endif
case SQL_BINARY:
case SQL_VARBINARY:
case SQL_LONGVARBINARY:
More information about the asterisk-commits
mailing list