From: Robert Roebling <robert@roebling.de>
Date: Sat, 29 Jan 2000 17:52:53 +0000 (+0000)
Subject:   Disabled ODBC code by default,
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/16b52fa1b7a95f89e93d2812758cb511b6553120

  Disabled ODBC code by default,
  Move isql.h and isqlext.h to /include/wx


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/Makefile.in b/Makefile.in
index 4957a3dfec..b89ed941b8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 19:55, 2000/01/27
+# This file was automatically generated by tmake at 18:29, 2000/01/29
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -279,6 +279,8 @@ WX_HEADERS = \
 		intl.h \
 		ioswrap.h \
 		ipcbase.h \
+		isql.h \
+		isqlext.h \
 		joystick.h \
 		layout.h \
 		laywin.h \
@@ -677,8 +679,6 @@ UNIX_HEADERS = \
 		unix/execute.h \
 		unix/fontutil.h \
 		unix/gsockunx.h \
-		unix/isql.h \
-		unix/isqlext.h \
 		unix/mimetype.h
 
 GENERIC_HEADERS = \
diff --git a/configure b/configure
index 242d29ed81..f3f1a4a9e2 100755
--- a/configure
+++ b/configure
@@ -38,7 +38,7 @@
 
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
+# Generated automatically using autoconf version 2.14 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -596,7 +596,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
+    echo "configure generated by autoconf version 2.14"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -1363,7 +1363,7 @@ else
   DEFAULT_wxUSE_LIBPNG=yes
   DEFAULT_wxUSE_LIBJPEG=yes
   DEFAULT_wxUSE_LIBTIFF=yes
-  DEFAULT_wxUSE_ODBC=yes
+  DEFAULT_wxUSE_ODBC=no
 
   DEFAULT_wxUSE_STD_IOSTREAM=no
   DEFAULT_wxUSE_FILE=yes
@@ -7600,6 +7600,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char gethostbyname();
+char (*f)();
 
 int main() {
 
@@ -7609,12 +7610,12 @@ int main() {
 #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
 choke me
 #else
-gethostbyname();
+f = gethostbyname;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:7618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -7635,7 +7636,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:7639: checking for gethostbyname in -lnsl" >&5
+echo "configure:7640: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7643,7 +7644,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7647 "configure"
+#line 7648 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7654,7 +7655,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:7658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7684,12 +7685,12 @@ fi
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:7688: checking for connect" >&5
+echo "configure:7689: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7693 "configure"
+#line 7694 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -7698,6 +7699,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char connect();
+char (*f)();
 
 int main() {
 
@@ -7707,12 +7709,12 @@ int main() {
 #if defined (__stub_connect) || defined (__stub___connect)
 choke me
 #else
-connect();
+f = connect;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:7716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -7733,7 +7735,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:7737: checking for connect in -lsocket" >&5
+echo "configure:7739: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7741,7 +7743,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7745 "configure"
+#line 7747 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7752,7 +7754,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:7756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7776,12 +7778,12 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:7780: checking for remove" >&5
+echo "configure:7782: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7785 "configure"
+#line 7787 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -7790,6 +7792,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char remove();
+char (*f)();
 
 int main() {
 
@@ -7799,12 +7802,12 @@ int main() {
 #if defined (__stub_remove) || defined (__stub___remove)
 choke me
 #else
-remove();
+f = remove;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:7808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -7825,7 +7828,7 @@ fi
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:7829: checking for remove in -lposix" >&5
+echo "configure:7832: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7833,7 +7836,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7837 "configure"
+#line 7840 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7844,7 +7847,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:7848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7868,12 +7871,12 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:7872: checking for shmat" >&5
+echo "configure:7875: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7877 "configure"
+#line 7880 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -7882,6 +7885,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char shmat();
+char (*f)();
 
 int main() {
 
@@ -7891,12 +7895,12 @@ int main() {
 #if defined (__stub_shmat) || defined (__stub___shmat)
 choke me
 #else
-shmat();
+f = shmat;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:7900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -7917,7 +7921,7 @@ fi
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:7921: checking for shmat in -lipc" >&5
+echo "configure:7925: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7925,7 +7929,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7929 "configure"
+#line 7933 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7936,7 +7940,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:7940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7969,7 +7973,7 @@ fi
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:7973: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:7977: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7977,7 +7981,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7981 "configure"
+#line 7985 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7988,7 +7992,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:7992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8024,7 +8028,7 @@ fi
 
                                                                                                 
     echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
-echo "configure:8028: checking for Motif/Lesstif headers" >&5
+echo "configure:8032: checking for Motif/Lesstif headers" >&5
     
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
@@ -8043,7 +8047,7 @@ for ac_dir in $SEARCH_INCLUDE;
     fi
 
     echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
-echo "configure:8047: checking for Motif/Lesstif library" >&5
+echo "configure:8051: checking for Motif/Lesstif library" >&5
     
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
@@ -8086,7 +8090,7 @@ for ac_dir in $SEARCH_LIB;
     fi
 
     echo $ac_n "checking for Xt library""... $ac_c" 1>&6
-echo "configure:8090: checking for Xt library" >&5
+echo "configure:8094: checking for Xt library" >&5
     
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
@@ -8118,7 +8122,7 @@ for ac_dir in $SEARCH_LIB;
 
     XPM_LINK=""
     echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:8122: checking for Xpm library" >&5
+echo "configure:8126: checking for Xpm library" >&5
     
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
@@ -8347,17 +8351,17 @@ for ac_hdr in strings.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8351: checking for $ac_hdr" >&5
+echo "configure:8355: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8356 "configure"
+#line 8360 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8387,17 +8391,17 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8391: checking for $ac_hdr" >&5
+echo "configure:8395: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8396 "configure"
+#line 8400 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8427,17 +8431,17 @@ for ac_hdr in wchar.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8431: checking for $ac_hdr" >&5
+echo "configure:8435: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8436 "configure"
+#line 8440 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8467,17 +8471,17 @@ for ac_hdr in wcstr.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8471: checking for $ac_hdr" >&5
+echo "configure:8475: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8476 "configure"
+#line 8480 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8481: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8507,17 +8511,17 @@ for ac_hdr in fnmatch.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8511: checking for $ac_hdr" >&5
+echo "configure:8515: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8516 "configure"
+#line 8520 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8549,17 +8553,17 @@ if test "$wxUSE_GUI" = "yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8553: checking for $ac_hdr" >&5
+echo "configure:8557: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8558 "configure"
+#line 8562 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8589,12 +8593,12 @@ fi
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:8593: checking for ANSI C header files" >&5
+echo "configure:8597: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8598 "configure"
+#line 8602 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -8602,7 +8606,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8619,7 +8623,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 8623 "configure"
+#line 8627 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -8637,7 +8641,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 8641 "configure"
+#line 8645 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -8658,7 +8662,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 8662 "configure"
+#line 8666 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -8669,7 +8673,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:8673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -8693,12 +8697,12 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:8697: checking for mode_t" >&5
+echo "configure:8701: checking for mode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8702 "configure"
+#line 8706 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -8726,12 +8730,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:8730: checking for off_t" >&5
+echo "configure:8734: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8735 "configure"
+#line 8739 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -8759,12 +8763,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:8763: checking for pid_t" >&5
+echo "configure:8767: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8768 "configure"
+#line 8772 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -8792,12 +8796,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:8796: checking for size_t" >&5
+echo "configure:8800: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8801 "configure"
+#line 8805 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -8825,12 +8829,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:8829: checking for uid_t in sys/types.h" >&5
+echo "configure:8833: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8834 "configure"
+#line 8838 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -8861,13 +8865,13 @@ fi
 
 
 echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6
-echo "configure:8865: checking for pw_gecos in struct passwd" >&5
+echo "configure:8869: checking for pw_gecos in struct passwd" >&5
 if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF
-#line 8871 "configure"
+#line 8875 "configure"
 #include "confdefs.h"
 #include <pwd.h>
 int main() {
@@ -8878,7 +8882,7 @@ int main() {
              
 ; return 0; }
 EOF
-if { (eval echo configure:8882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                 wx_cv_struct_pw_gecos=yes
@@ -8905,12 +8909,12 @@ echo "$ac_t""$wx_cv_struct_pw_gecos" 1>&6
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:8909: checking for working const" >&5
+echo "configure:8913: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8914 "configure"
+#line 8918 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -8959,7 +8963,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:8963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -8980,21 +8984,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:8984: checking for inline" >&5
+echo "configure:8988: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 8991 "configure"
+#line 8995 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:8998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -9021,7 +9025,7 @@ esac
 
 
 echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:9025: checking size of char" >&5
+echo "configure:9029: checking size of char" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9029,7 +9033,7 @@ else
   ac_cv_sizeof_char=1
 else
   cat > conftest.$ac_ext <<EOF
-#line 9033 "configure"
+#line 9037 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -9040,7 +9044,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:9044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_char=`cat conftestval`
 else
@@ -9060,7 +9064,7 @@ EOF
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:9064: checking size of short" >&5
+echo "configure:9068: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9068,7 +9072,7 @@ else
   ac_cv_sizeof_short=2
 else
   cat > conftest.$ac_ext <<EOF
-#line 9072 "configure"
+#line 9076 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -9079,7 +9083,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:9083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -9099,7 +9103,7 @@ EOF
 
 
 echo $ac_n "checking size of int *""... $ac_c" 1>&6
-echo "configure:9103: checking size of int *" >&5
+echo "configure:9107: checking size of int *" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9107,7 +9111,7 @@ else
   ac_cv_sizeof_int_p=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 9111 "configure"
+#line 9115 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -9118,7 +9122,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:9122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int_p=`cat conftestval`
 else
@@ -9138,7 +9142,7 @@ EOF
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:9142: checking size of int" >&5
+echo "configure:9146: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9146,7 +9150,7 @@ else
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 9150 "configure"
+#line 9154 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -9157,7 +9161,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:9161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -9177,7 +9181,7 @@ EOF
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:9181: checking size of long" >&5
+echo "configure:9185: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9185,7 +9189,7 @@ else
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 9189 "configure"
+#line 9193 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -9196,7 +9200,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:9200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -9216,7 +9220,7 @@ EOF
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:9220: checking size of long long" >&5
+echo "configure:9224: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9224,7 +9228,7 @@ else
   ac_cv_sizeof_long_long=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 9228 "configure"
+#line 9232 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -9235,7 +9239,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:9239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -9256,14 +9260,14 @@ EOF
 
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:9260: checking whether byte ordering is bigendian" >&5
+echo "configure:9264: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 9267 "configure"
+#line 9271 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -9274,11 +9278,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:9278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 9282 "configure"
+#line 9286 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -9289,7 +9293,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:9293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -9309,7 +9313,7 @@ if test "$cross_compiling" = yes; then
   ac_cv_c_bigendian=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 9313 "configure"
+#line 9317 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -9322,7 +9326,7 @@ main () {
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:9326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
 else
@@ -9369,17 +9373,17 @@ cross_compiling=$ac_cv_prog_cxx_cross
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9373: checking for $ac_hdr" >&5
+echo "configure:9377: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9378 "configure"
+#line 9382 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9427,7 +9431,7 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 
   echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
-echo "configure:9431: checking if C++ compiler supports bool" >&5
+echo "configure:9435: checking if C++ compiler supports bool" >&5
 if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9442,7 +9446,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
     cat > conftest.$ac_ext <<EOF
-#line 9446 "configure"
+#line 9450 "configure"
 #include "confdefs.h"
 
       
@@ -9454,7 +9458,7 @@ int main() {
       
 ; return 0; }
 EOF
-if { (eval echo configure:9458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
         cat >> confdefs.h <<\EOF
@@ -9496,13 +9500,13 @@ EOF
 
 
 echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6
-echo "configure:9500: checking if you need GNU extensions" >&5
+echo "configure:9504: checking if you need GNU extensions" >&5
 if eval "test \"`echo '$''{'wx_cv_gnu_extensions'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
    cat > conftest.$ac_ext <<EOF
-#line 9506 "configure"
+#line 9510 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -9515,7 +9519,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:9519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_gnu_extensions=yes
 else
@@ -9540,7 +9544,7 @@ fi
 
 
 echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6
-echo "configure:9544: checking for wcslen in -lc" >&5
+echo "configure:9548: checking for wcslen in -lc" >&5
 ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9548,7 +9552,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9552 "configure"
+#line 9556 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9559,7 +9563,7 @@ int main() {
 wcslen()
 ; return 0; }
 EOF
-if { (eval echo configure:9563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9585,7 +9589,7 @@ else
   echo "$ac_t""no" 1>&6
 
             echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
-echo "configure:9589: checking for wcslen in -lw" >&5
+echo "configure:9593: checking for wcslen in -lw" >&5
 ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9593,7 +9597,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lw  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9597 "configure"
+#line 9601 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9604,7 +9608,7 @@ int main() {
 wcslen()
 ; return 0; }
 EOF
-if { (eval echo configure:9608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9635,12 +9639,12 @@ fi
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:9639: checking for vprintf" >&5
+echo "configure:9643: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9644 "configure"
+#line 9648 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -9649,6 +9653,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char vprintf();
+char (*f)();
 
 int main() {
 
@@ -9658,12 +9663,12 @@ int main() {
 #if defined (__stub_vprintf) || defined (__stub___vprintf)
 choke me
 #else
-vprintf();
+f = vprintf;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:9667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -9687,12 +9692,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:9691: checking for _doprnt" >&5
+echo "configure:9696: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9696 "configure"
+#line 9701 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -9701,6 +9706,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char _doprnt();
+char (*f)();
 
 int main() {
 
@@ -9710,12 +9716,12 @@ int main() {
 #if defined (__stub__doprnt) || defined (__stub____doprnt)
 choke me
 #else
-_doprnt();
+f = _doprnt;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:9719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -9743,12 +9749,12 @@ fi
 for ac_func in vsnprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9747: checking for $ac_func" >&5
+echo "configure:9753: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9752 "configure"
+#line 9758 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9757,6 +9763,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -9766,12 +9773,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:9775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -9811,7 +9818,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
 echo $ac_n "checking for vsscanf""... $ac_c" 1>&6
-echo "configure:9815: checking for vsscanf" >&5
+echo "configure:9822: checking for vsscanf" >&5
 if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9821,7 +9828,7 @@ else
              
 else
   cat > conftest.$ac_ext <<EOF
-#line 9825 "configure"
+#line 9832 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
@@ -9848,7 +9855,7 @@ extern "C" void exit(int);
                 }
              
 EOF
-if { (eval echo configure:9852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
                 cat >> confdefs.h <<\EOF
@@ -9884,12 +9891,12 @@ if test "$USE_UNIX" = 1; then
 for ac_func in vfork
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9888: checking for $ac_func" >&5
+echo "configure:9895: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9893 "configure"
+#line 9900 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9898,6 +9905,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -9907,12 +9915,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:9916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -9940,12 +9948,12 @@ done
 for ac_func in timegm
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9944: checking for $ac_func" >&5
+echo "configure:9952: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9949 "configure"
+#line 9957 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9954,6 +9962,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -9963,12 +9972,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:9972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10007,12 +10016,12 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
     for ac_func in nanosleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10011: checking for $ac_func" >&5
+echo "configure:10020: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10016 "configure"
+#line 10025 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10021,6 +10030,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -10030,12 +10040,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:10039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10060,7 +10070,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
-echo "configure:10064: checking for nanosleep in -lposix4" >&5
+echo "configure:10074: checking for nanosleep in -lposix4" >&5
 ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10068,7 +10078,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10072 "configure"
+#line 10082 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10079,7 +10089,7 @@ int main() {
 nanosleep()
 ; return 0; }
 EOF
-if { (eval echo configure:10083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10107,12 +10117,12 @@ else
                     for ac_func in usleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10111: checking for $ac_func" >&5
+echo "configure:10121: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10116 "configure"
+#line 10126 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10121,6 +10131,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -10130,12 +10141,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:10139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10174,12 +10185,12 @@ fi
 for ac_func in uname gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10178: checking for $ac_func" >&5
+echo "configure:10189: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10183 "configure"
+#line 10194 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10188,6 +10199,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -10197,12 +10209,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:10206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10230,12 +10242,12 @@ done
 for ac_func in strtok_r
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10234: checking for $ac_func" >&5
+echo "configure:10246: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10239 "configure"
+#line 10251 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10244,6 +10256,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -10253,12 +10266,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:10262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10287,12 +10300,12 @@ INET_LINK=
 for ac_func in inet_addr
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10291: checking for $ac_func" >&5
+echo "configure:10304: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10296 "configure"
+#line 10309 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10301,6 +10314,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -10310,12 +10324,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:10319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10340,7 +10354,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
-echo "configure:10344: checking for inet_addr in -lnsl" >&5
+echo "configure:10358: checking for inet_addr in -lnsl" >&5
 ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10348,7 +10362,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10352 "configure"
+#line 10366 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10359,7 +10373,7 @@ int main() {
 inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:10363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10378,7 +10392,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
-echo "configure:10382: checking for inet_addr in -lresolv" >&5
+echo "configure:10396: checking for inet_addr in -lresolv" >&5
 ac_lib_var=`echo resolv'_'inet_addr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10386,7 +10400,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10390 "configure"
+#line 10404 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10397,7 +10411,7 @@ int main() {
 inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:10401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10430,12 +10444,12 @@ done
 for ac_func in inet_aton
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10434: checking for $ac_func" >&5
+echo "configure:10448: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10439 "configure"
+#line 10453 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10444,6 +10458,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -10453,12 +10468,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:10462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10483,7 +10498,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
             echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
-echo "configure:10487: checking for inet_aton in -l$INET_LINK" >&5
+echo "configure:10502: checking for inet_aton in -l$INET_LINK" >&5
 ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10491,7 +10506,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$INET_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10495 "configure"
+#line 10510 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10502,7 +10517,7 @@ int main() {
 inet_aton()
 ; return 0; }
 EOF
-if { (eval echo configure:10506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10609,7 +10624,7 @@ fi
 if test "$wxUSE_THREADS" = "yes" ; then
     
                 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:10613: checking for pthread_create in -lpthread" >&5
+echo "configure:10628: checking for pthread_create in -lpthread" >&5
 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10617,7 +10632,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10621 "configure"
+#line 10636 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10628,7 +10643,7 @@ int main() {
 pthread_create()
 ; return 0; }
 EOF
-if { (eval echo configure:10632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10651,7 +10666,7 @@ else
   echo "$ac_t""no" 1>&6
 
                         echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:10655: checking for pthread_create in -lc_r" >&5
+echo "configure:10670: checking for pthread_create in -lc_r" >&5
 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10659,7 +10674,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10663 "configure"
+#line 10678 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10670,7 +10685,7 @@ int main() {
 pthread_create()
 ; return 0; }
 EOF
-if { (eval echo configure:10674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10694,17 +10709,17 @@ else
 
                                 ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
-echo "configure:10698: checking for sys/prctl.h" >&5
+echo "configure:10713: checking for sys/prctl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10703 "configure"
+#line 10718 "configure"
 #include "confdefs.h"
 #include <sys/prctl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10744,12 +10759,12 @@ if test "$wxUSE_THREADS" = "yes" ; then
   for ac_func in thr_setconcurrency
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10748: checking for $ac_func" >&5
+echo "configure:10763: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10753 "configure"
+#line 10768 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10758,6 +10773,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -10767,12 +10783,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:10776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10802,17 +10818,17 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10806: checking for $ac_hdr" >&5
+echo "configure:10822: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10811 "configure"
+#line 10827 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10840,7 +10856,7 @@ done
 
 
   echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:10844: checking for sched_yield in -l$THREADS_LINK" >&5
+echo "configure:10860: checking for sched_yield in -l$THREADS_LINK" >&5
 ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10848,7 +10864,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10852 "configure"
+#line 10868 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10859,7 +10875,7 @@ int main() {
 sched_yield()
 ; return 0; }
 EOF
-if { (eval echo configure:10863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10881,7 +10897,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6
-echo "configure:10885: checking for sched_yield in -l"posix4"" >&5
+echo "configure:10901: checking for sched_yield in -l"posix4"" >&5
 ac_lib_var=`echo "posix4"'_'sched_yield | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10889,7 +10905,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l"posix4"  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10893 "configure"
+#line 10909 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10900,7 +10916,7 @@ int main() {
 sched_yield()
 ; return 0; }
 EOF
-if { (eval echo configure:10904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10930,7 +10946,7 @@ fi
 
 
                 echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:10934: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
+echo "configure:10950: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
 ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10938,7 +10954,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10942 "configure"
+#line 10958 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10949,7 +10965,7 @@ int main() {
 pthread_attr_getschedpolicy()
 ; return 0; }
 EOF
-if { (eval echo configure:10953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10971,7 +10987,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6
-echo "configure:10975: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5
+echo "configure:10991: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5
 ac_lib_var=`echo "posix4"'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10979,7 +10995,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l"posix4"  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10983 "configure"
+#line 10999 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10990,7 +11006,7 @@ int main() {
 pthread_attr_getschedpolicy()
 ; return 0; }
 EOF
-if { (eval echo configure:10994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11020,7 +11036,7 @@ fi
 
 
   echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:11024: checking for pthread_cancel in -l$THREADS_LINK" >&5
+echo "configure:11040: checking for pthread_cancel in -l$THREADS_LINK" >&5
 ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11028,7 +11044,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11032 "configure"
+#line 11048 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11039,7 +11055,7 @@ int main() {
 pthread_cancel()
 ; return 0; }
 EOF
-if { (eval echo configure:11043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11065,13 +11081,13 @@ fi
 
 
   echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
-echo "configure:11069: checking for pthread_cleanup_push/pop" >&5
+echo "configure:11085: checking for pthread_cleanup_push/pop" >&5
 if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 11075 "configure"
+#line 11091 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
@@ -11081,7 +11097,7 @@ int main() {
                  
 ; return 0; }
 EOF
-if { (eval echo configure:11085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     wx_cv_func_pthread_cleanup_push=yes
@@ -11122,7 +11138,7 @@ EOF
 else
       if test "$ac_cv_func_strtok_r" = "yes"; then
     echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
-echo "configure:11126: checking if -D_REENTRANT is needed" >&5
+echo "configure:11142: checking if -D_REENTRANT is needed" >&5
     if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
         CFLAGS="${CFLAGS} -D_REENTRANT"
         CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
@@ -11277,17 +11293,17 @@ fi
 if test "$wxUSE_OPENGL" = "yes"; then
   ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
-echo "configure:11281: checking for GL/gl.h" >&5
+echo "configure:11297: checking for GL/gl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11286 "configure"
+#line 11302 "configure"
 #include "confdefs.h"
 #include <GL/gl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11305,7 +11321,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
     echo $ac_n "checking for glInitNames in -lGL""... $ac_c" 1>&6
-echo "configure:11309: checking for glInitNames in -lGL" >&5
+echo "configure:11325: checking for glInitNames in -lGL" >&5
 ac_lib_var=`echo GL'_'glInitNames | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11313,7 +11329,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lGL wxUSE_OPENGL=0 $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11317 "configure"
+#line 11333 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11324,7 +11340,7 @@ int main() {
 glInitNames()
 ; return 0; }
 EOF
-if { (eval echo configure:11328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11351,7 +11367,7 @@ else
   echo "$ac_t""no" 1>&6
 
         echo $ac_n "checking for glInitNames in -lMesaGL""... $ac_c" 1>&6
-echo "configure:11355: checking for glInitNames in -lMesaGL" >&5
+echo "configure:11371: checking for glInitNames in -lMesaGL" >&5
 ac_lib_var=`echo MesaGL'_'glInitNames | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11359,7 +11375,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lMesaGL  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11363 "configure"
+#line 11379 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11370,7 +11386,7 @@ int main() {
 glInitNames()
 ; return 0; }
 EOF
-if { (eval echo configure:11374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11557,12 +11573,12 @@ if test "$wxUSE_TIMEDATE" = "yes"; then
         for ac_func in strptime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11561: checking for $ac_func" >&5
+echo "configure:11577: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11566 "configure"
+#line 11582 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11571,6 +11587,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -11580,12 +11597,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:11589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11611,13 +11628,13 @@ done
 
 
         echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
-echo "configure:11615: checking for timezone variable in <time.h>" >&5
+echo "configure:11632: checking for timezone variable in <time.h>" >&5
 if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                         cat > conftest.$ac_ext <<EOF
-#line 11621 "configure"
+#line 11638 "configure"
 #include "confdefs.h"
 
                                 #include <time.h>
@@ -11629,7 +11646,7 @@ int main() {
                             
 ; return 0; }
 EOF
-if { (eval echo configure:11633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                                 wx_cv_var_timezone=__timezone
@@ -11640,7 +11657,7 @@ else
   rm -rf conftest*
   
                                 cat > conftest.$ac_ext <<EOF
-#line 11644 "configure"
+#line 11661 "configure"
 #include "confdefs.h"
 
                                         #include <time.h>
@@ -11652,7 +11669,7 @@ int main() {
                                     
 ; return 0; }
 EOF
-if { (eval echo configure:11656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                                         wx_cv_var_timezone=_timezone
@@ -11663,7 +11680,7 @@ else
   rm -rf conftest*
   
                                         cat > conftest.$ac_ext <<EOF
-#line 11667 "configure"
+#line 11684 "configure"
 #include "confdefs.h"
 
                                                 #include <time.h>
@@ -11675,7 +11692,7 @@ int main() {
                                             
 ; return 0; }
 EOF
-if { (eval echo configure:11679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                                                 wx_cv_var_timezone=timezone
@@ -11710,12 +11727,12 @@ EOF
             for ac_func in localtime gettimeofday ftime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11714: checking for $ac_func" >&5
+echo "configure:11731: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11719 "configure"
+#line 11736 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11724,6 +11741,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -11733,12 +11751,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:11742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11765,13 +11783,13 @@ done
 
     if test "$ac_cv_func_localtime" = "yes"; then
         echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:11769: checking for tm_gmtoff in struct tm" >&5
+echo "configure:11787: checking for tm_gmtoff in struct tm" >&5
 if eval "test \"`echo '$''{'wx_cv_struct_tm_has_gmtoff'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
             cat > conftest.$ac_ext <<EOF
-#line 11775 "configure"
+#line 11793 "configure"
 #include "confdefs.h"
 
                     #include <time.h>
@@ -11783,7 +11801,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:11787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     wx_cv_struct_tm_has_gmtoff=yes
@@ -11806,7 +11824,7 @@ fi
 echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&6
     elif test "$ac_cv_func_gettimeofday" = "yes"; then
         echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
-echo "configure:11810: checking whether gettimeofday takes two arguments" >&5
+echo "configure:11828: checking whether gettimeofday takes two arguments" >&5
 if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11821,7 +11839,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
             cat > conftest.$ac_ext <<EOF
-#line 11825 "configure"
+#line 11843 "configure"
 #include "confdefs.h"
 
                     #include <sys/time.h>
@@ -11835,7 +11853,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:11839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=yes
 else
@@ -11843,7 +11861,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 11847 "configure"
+#line 11865 "configure"
 #include "confdefs.h"
 
                         #include <sys/time.h>
@@ -11856,7 +11874,7 @@ int main() {
                     
 ; return 0; }
 EOF
-if { (eval echo configure:11860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=no
 else
@@ -11900,12 +11918,12 @@ fi
 
 if test "$wxUSE_SOCKETS" = "yes"; then
         echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:11904: checking for socket" >&5
+echo "configure:11922: checking for socket" >&5
 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11909 "configure"
+#line 11927 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -11914,6 +11932,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char socket();
+char (*f)();
 
 int main() {
 
@@ -11923,12 +11942,12 @@ int main() {
 #if defined (__stub_socket) || defined (__stub___socket)
 choke me
 #else
-socket();
+f = socket;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:11932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -11946,7 +11965,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:11950: checking for socket in -lsocket" >&5
+echo "configure:11969: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11954,7 +11973,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11958 "configure"
+#line 11977 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11965,7 +11984,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:11969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12005,16 +12024,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
         echo $ac_n "checking the type of the third argument of getsockname""... $ac_c" 1>&6
-echo "configure:12009: checking the type of the third argument of getsockname" >&5
+echo "configure:12028: checking the type of the third argument of getsockname" >&5
     cat > conftest.$ac_ext <<EOF
-#line 12011 "configure"
+#line 12030 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 int main() {
 socklen_t len; getsockname(0, 0, &len);
 ; return 0; }
 EOF
-if { (eval echo configure:12018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define SOCKLEN_T socklen_t
@@ -12025,14 +12044,14 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 12029 "configure"
+#line 12048 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 int main() {
 size_t len; getsockname(0, 0, &len);
 ; return 0; }
 EOF
-if { (eval echo configure:12036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define SOCKLEN_T size_t
@@ -12043,14 +12062,14 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 12047 "configure"
+#line 12066 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 int main() {
 int len; getsockname(0, 0, &len);
 ; return 0; }
 EOF
-if { (eval echo configure:12054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define SOCKLEN_T int
@@ -12092,17 +12111,17 @@ if test "$wxUSE_JOYSTICK" = 1; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12096: checking for $ac_hdr" >&5
+echo "configure:12115: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12101 "configure"
+#line 12120 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12144,12 +12163,12 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
                 for ac_func in dlopen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12148: checking for $ac_func" >&5
+echo "configure:12167: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12153 "configure"
+#line 12172 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12158,6 +12177,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -12167,12 +12187,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:12176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -12200,7 +12220,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:12204: checking for dlopen in -ldl" >&5
+echo "configure:12224: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12208,7 +12228,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12212 "configure"
+#line 12232 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12219,7 +12239,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:12223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12248,12 +12268,12 @@ else
                             for ac_func in shl_load
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12252: checking for $ac_func" >&5
+echo "configure:12272: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12257 "configure"
+#line 12277 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12262,6 +12282,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -12271,12 +12292,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:12280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -12505,17 +12526,17 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12509: checking for $ac_hdr" >&5
+echo "configure:12530: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12514 "configure"
+#line 12535 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13031,7 +13052,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:13035: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:13056: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13157,7 +13178,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+    echo "$CONFIG_STATUS generated by autoconf version 2.14"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -13176,6 +13197,7 @@ trap 'rm -fr `echo "
             Makefile
             demos/Makefile
             demos/bombs/Makefile
+            demos/dbbrowse/Makefile
             demos/forty/Makefile
             demos/fractal/Makefile
             demos/life/Makefile
@@ -13420,6 +13442,7 @@ CONFIG_FILES=\${CONFIG_FILES-"wx-config
             Makefile
             demos/Makefile
             demos/bombs/Makefile
+            demos/dbbrowse/Makefile
             demos/forty/Makefile
             demos/fractal/Makefile
             demos/life/Makefile
diff --git a/configure.in b/configure.in
index 0e59f1e225..36a527a432 100644
--- a/configure.in
+++ b/configure.in
@@ -764,7 +764,7 @@ else
   DEFAULT_wxUSE_LIBPNG=yes
   DEFAULT_wxUSE_LIBJPEG=yes
   DEFAULT_wxUSE_LIBTIFF=yes
-  DEFAULT_wxUSE_ODBC=yes
+  DEFAULT_wxUSE_ODBC=no
 
   DEFAULT_wxUSE_STD_IOSTREAM=no
   DEFAULT_wxUSE_FILE=yes
@@ -3305,6 +3305,7 @@ AC_OUTPUT([
             Makefile
             demos/Makefile
             demos/bombs/Makefile
+            demos/dbbrowse/Makefile
             demos/forty/Makefile
             demos/fractal/Makefile
             demos/life/Makefile
diff --git a/demos/dbbrowse/Makefile.in b/demos/dbbrowse/Makefile.in
new file mode 100644
index 0000000000..4dcf3d454b
--- /dev/null
+++ b/demos/dbbrowse/Makefile.in
@@ -0,0 +1,23 @@
+#
+# File:		Makefile.in
+# Author:	Julian Smart
+# Created:	1998
+# Updated:	
+# Copyright:	(c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for bombs example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+program_dir = demos/dbbrowse
+
+PROGRAM=dbbrowser
+
+
+OBJECTS= dbbrowser.o doc.o pgmctrl.o wxtbpgwin.o \
+         browserdb.o dbtree.o dbgrid.o  dlguser.o
+         
+include ../../src/makeprog.env
+
diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 1a716ec125..10222b1743 100644
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -622,6 +622,8 @@ imaglist.h	W
 intl.h	W	B
 ioswrap.h	W	B
 ipcbase.h	W
+isql.h	W
+isqlext.h	W
 joystick.h	W
 layout.h	W
 laywin.h	W
@@ -1040,8 +1042,6 @@ fontutil.h	S
 execute.h	S
 mimetype.h	S	B
 gsockunx.h	S
-isql.h	S
-isqlext.h	S
 
 file.h	P
 ftp.h	P
diff --git a/include/wx/db.h b/include/wx/db.h
index 228a033262..c71df55bf9 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -49,10 +49,12 @@
 	#endif
 #endif
 
+#include "wx/setup.h"
+
 #if wxMAJOR_VERSION == 2
 	extern "C" {
-	#include "wx/unix/isql.h"
-	#include "wx/unix/isqlext.h"
+	#include "wx/isql.h"
+	#include "wx/isqlext.h"
 	}
 #else  // version == 1
 	extern "C" {
diff --git a/include/wx/isql.h b/include/wx/isql.h
new file mode 100644
index 0000000000..a1f406626d
--- /dev/null
+++ b/include/wx/isql.h
@@ -0,0 +1,230 @@
+/*
+ *  isql.h
+ *
+ *  $Id$
+ *
+ *  iODBC defines
+ *
+ *  The iODBC driver manager.
+ *  
+ *  Copyright (C) 1995 by Ke Jin <kejin@empress.com> 
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef _ISQL_H
+#define _ISQL_H
+
+#ifdef WIN32
+#define SQL_API				__stdcall
+#else
+#define FAR
+#define EXPORT
+#define CALLBACK
+#define SQL_API				EXPORT CALLBACK
+
+typedef void *HWND;
+#endif
+
+typedef void *SQLHWND;
+
+typedef unsigned char UCHAR;
+typedef long int SDWORD;
+typedef short int SWORD;
+typedef unsigned long int UDWORD;
+typedef unsigned short int UWORD;
+
+typedef void FAR *PTR;
+typedef void FAR *HENV;
+typedef void FAR *HDBC;
+typedef void FAR *HSTMT;
+
+typedef signed short RETCODE;
+#define SQLRETURN	RETCODE
+
+
+#define ODBCVER				0x0250
+
+#define SQL_MAX_MESSAGE_LENGTH		512
+#define SQL_MAX_DSN_LENGTH		32
+
+/*
+ *  Function return codes
+ */
+#define SQL_INVALID_HANDLE		(-2)
+#define SQL_ERROR			(-1)
+#define SQL_SUCCESS 			0
+#define SQL_SUCCESS_WITH_INFO		1
+#define SQL_NO_DATA_FOUND		100
+
+/*
+ *  Standard SQL datatypes, using ANSI type numbering
+ */
+#define SQL_CHAR			1
+#define SQL_NUMERIC 			2
+#define SQL_DECIMAL 			3
+#define SQL_INTEGER 			4
+#define SQL_SMALLINT			5
+#define SQL_FLOAT			6
+#define SQL_REAL			7
+#define SQL_DOUBLE			8
+#define SQL_VARCHAR 			12
+
+#define SQL_TYPE_MIN			SQL_CHAR
+#define SQL_TYPE_NULL			0
+#define SQL_TYPE_MAX			SQL_VARCHAR
+
+/*
+ *  C datatype to SQL datatype mapping
+ */
+#define SQL_C_CHAR			SQL_CHAR
+#define SQL_C_LONG			SQL_INTEGER
+#define SQL_C_SHORT			SQL_SMALLINT
+#define SQL_C_FLOAT			SQL_REAL
+#define SQL_C_DOUBLE			SQL_DOUBLE
+#define SQL_C_DEFAULT 			99
+
+/*
+ *  NULL status constants.
+ */
+#define SQL_NO_NULLS			0
+#define SQL_NULLABLE			1
+#define SQL_NULLABLE_UNKNOWN		2
+
+/*
+ *  Special length values
+ */
+#define SQL_NULL_DATA			(-1)
+#define SQL_DATA_AT_EXEC		(-2)
+#define SQL_NTS 			(-3)
+
+/*
+ *  SQLFreeStmt
+ */
+#define SQL_CLOSE			0
+#define SQL_DROP			1
+#define SQL_UNBIND			2
+#define SQL_RESET_PARAMS		3
+
+/*
+ *  SQLTransact
+ */
+#define SQL_COMMIT			0
+#define SQL_ROLLBACK			1
+
+/*
+ *  SQLColAttributes
+ */
+#define SQL_COLUMN_COUNT		0
+#define SQL_COLUMN_NAME			1
+#define SQL_COLUMN_TYPE			2
+#define SQL_COLUMN_LENGTH		3
+#define SQL_COLUMN_PRECISION		4
+#define SQL_COLUMN_SCALE		5
+#define SQL_COLUMN_DISPLAY_SIZE		6
+#define SQL_COLUMN_NULLABLE		7
+#define SQL_COLUMN_UNSIGNED		8
+#define SQL_COLUMN_MONEY		9
+#define SQL_COLUMN_UPDATABLE		10
+#define SQL_COLUMN_AUTO_INCREMENT	11
+#define SQL_COLUMN_CASE_SENSITIVE	12
+#define SQL_COLUMN_SEARCHABLE		13
+#define SQL_COLUMN_TYPE_NAME		14
+#define SQL_COLUMN_TABLE_NAME		15
+#define SQL_COLUMN_OWNER_NAME		16
+#define SQL_COLUMN_QUALIFIER_NAME	17
+#define SQL_COLUMN_LABEL		18
+
+#define SQL_COLATT_OPT_MAX		SQL_COLUMN_LABEL
+#define	SQL_COLATT_OPT_MIN		SQL_COLUMN_COUNT
+#define SQL_COLUMN_DRIVER_START		1000
+
+/*
+ *  SQLColAttributes : SQL_COLUMN_UPDATABLE
+ */
+#define SQL_ATTR_READONLY		0
+#define SQL_ATTR_WRITE			1
+#define SQL_ATTR_READWRITE_UNKNOWN	2
+
+/*
+ *  SQLColAttributes : SQL_COLUMN_SEARCHABLE
+ */
+#define SQL_UNSEARCHABLE		0
+#define SQL_LIKE_ONLY			1
+#define SQL_ALL_EXCEPT_LIKE 		2
+#define SQL_SEARCHABLE			3
+
+/*
+ *  NULL Handles
+ */
+#define SQL_NULL_HENV			0
+#define SQL_NULL_HDBC			0
+#define SQL_NULL_HSTMT			0
+
+
+/*
+ *  Function Prototypes
+ */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+  RETCODE SQL_API SQLAllocConnect (HENV henv, HDBC FAR * phdbc);
+  RETCODE SQL_API SQLAllocEnv (HENV FAR * phenv);
+  RETCODE SQL_API SQLAllocStmt (HDBC hdbc, HSTMT FAR * phstmt);
+  RETCODE SQL_API SQLBindCol (HSTMT hstmt, UWORD icol, SWORD fCType,
+      PTR rgbValue, SDWORD cbValueMax, SDWORD FAR * pcbValue);
+  RETCODE SQL_API SQLCancel (HSTMT hstmt);
+  RETCODE SQL_API SQLColAttributes (HSTMT hstmt, UWORD icol, UWORD fDescType,
+      PTR rgbDesc, SWORD cbDescMax, SWORD FAR * pcbDesc, SDWORD FAR * pfDesc);
+  RETCODE SQL_API SQLConnect (HDBC hdbc, UCHAR FAR * szDSN, SWORD cbDSN,
+      UCHAR FAR * szUID, SWORD cbUID, UCHAR FAR * szAuthStr, SWORD cbAuthStr);
+  RETCODE SQL_API SQLDescribeCol (HSTMT hstmt, UWORD icol,
+      UCHAR FAR * szColName, SWORD cbColNameMax, SWORD FAR * pcbColName,
+      SWORD FAR * pfSqlType, UDWORD FAR * pcbColDef, SWORD FAR * pibScale,
+      SWORD FAR * pfNullable);
+  RETCODE SQL_API SQLDisconnect (HDBC hdbc);
+  RETCODE SQL_API SQLError (HENV henv, HDBC hdbc, HSTMT hstmt,
+      UCHAR FAR * szSqlState, SDWORD FAR * pfNativeError, UCHAR FAR * szErrorMsg,
+      SWORD cbErrorMsgMax, SWORD FAR * pcbErrorMsg);
+  RETCODE SQL_API SQLExecDirect (HSTMT hstmt, UCHAR FAR * szSqlStr,
+      SDWORD cbSqlStr);
+  RETCODE SQL_API SQLExecute (HSTMT hstmt);
+  RETCODE SQL_API SQLFetch (HSTMT hstmt);
+  RETCODE SQL_API SQLFreeConnect (HDBC hdbc);
+  RETCODE SQL_API SQLFreeEnv (HENV henv);
+  RETCODE SQL_API SQLFreeStmt (HSTMT hstmt, UWORD fOption);
+  RETCODE SQL_API SQLGetCursorName (HSTMT hstmt, UCHAR FAR * szCursor,
+      SWORD cbCursorMax, SWORD FAR * pcbCursor);
+  RETCODE SQL_API SQLNumResultCols (HSTMT hstmt, SWORD FAR * pccol);
+  RETCODE SQL_API SQLPrepare (HSTMT hstmt, UCHAR FAR * szSqlStr,
+      SDWORD cbSqlStr);
+  RETCODE SQL_API SQLRowCount (HSTMT hstmt, SDWORD FAR * pcrow);
+  RETCODE SQL_API SQLSetCursorName (HSTMT hstmt, UCHAR FAR * szCursor,
+      SWORD cbCursor);
+  RETCODE SQL_API SQLTransact (HENV henv, HDBC hdbc, UWORD fType);
+
+/*
+ *  Depreciated ODBC 1.0 function - Use SQLBindParameter
+ */
+  RETCODE SQL_API SQLSetParam (HSTMT hstmt, UWORD ipar, SWORD fCType,
+      SWORD fSqlType, UDWORD cbColDef, SWORD ibScale, PTR rgbValue,
+      SDWORD FAR * pcbValue);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/include/wx/isqlext.h b/include/wx/isqlext.h
new file mode 100644
index 0000000000..414c300172
--- /dev/null
+++ b/include/wx/isqlext.h
@@ -0,0 +1,1177 @@
+/*
+ *
+ *  isqlext.h
+ *
+ *  $Id$
+ *
+ *  iODBC defines (ext)
+ *
+ *  The iODBC driver manager.
+ *  
+ *  Copyright (C) 1995 by Ke Jin <kejin@empress.com> 
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef	_ISQLEXT_H
+# define _ISQLEXT_H
+
+#include "isql.h"
+
+/*
+ *  Generic constants
+ */
+#define SQL_MAX_OPTION_STRING_LENGTH	256
+
+/*
+ *  Additional return codes
+ */
+#define SQL_STILL_EXECUTING 		2
+#define SQL_NEED_DATA			99
+
+/*
+ *  SQL extended datatypes
+ */
+#define SQL_DATE			9
+#define SQL_TIME			10
+#define SQL_TIMESTAMP			11
+#define SQL_LONGVARCHAR		 	(-1)
+#define SQL_BINARY			(-2)
+#define SQL_VARBINARY			(-3)
+#define SQL_LONGVARBINARY		(-4)
+#define SQL_BIGINT			(-5)
+#define SQL_TINYINT 			(-6)
+#define SQL_BIT 			(-7)
+
+#define SQL_INTERVAL_YEAR		(-80)
+#define SQL_INTERVAL_MONTH		(-81)
+#define SQL_INTERVAL_YEAR_TO_MONTH	(-82)
+#define SQL_INTERVAL_DAY		(-83)
+#define SQL_INTERVAL_HOUR		(-84)
+#define SQL_INTERVAL_MINUTE		(-85)
+#define SQL_INTERVAL_SECOND		(-86)
+#define SQL_INTERVAL_DAY_TO_HOUR	(-87)
+#define SQL_INTERVAL_DAY_TO_MINUTE	(-88)
+#define SQL_INTERVAL_DAY_TO_SECOND	(-89)
+#define SQL_INTERVAL_HOUR_TO_MINUTE	(-90)
+#define SQL_INTERVAL_HOUR_TO_SECOND	(-91)
+#define SQL_INTERVAL_MINUTE_TO_SECOND	(-92)
+#define SQL_UNICODE			(-95)
+
+#define SQL_TYPE_DRIVER_START		SQL_INTERVAL_YEAR
+#define SQL_TYPE_DRIVER_END		SQL_UNICODE
+
+#define SQL_SIGNED_OFFSET		(-20)
+#define SQL_UNSIGNED_OFFSET		(-22)
+
+/*
+ *  C datatype to SQL datatype mapping
+ */
+#define SQL_C_DATE			SQL_DATE
+#define SQL_C_TIME			SQL_TIME
+#define SQL_C_TIMESTAMP 		SQL_TIMESTAMP
+#define SQL_C_BINARY			SQL_BINARY
+#define SQL_C_BIT			SQL_BIT
+#define SQL_C_TINYINT			SQL_TINYINT
+#define SQL_C_SLONG 			SQL_C_LONG+SQL_SIGNED_OFFSET
+#define SQL_C_SSHORT			SQL_C_SHORT+SQL_SIGNED_OFFSET
+#define SQL_C_STINYINT			SQL_TINYINT+SQL_SIGNED_OFFSET
+#define SQL_C_ULONG 			SQL_C_LONG+SQL_UNSIGNED_OFFSET
+#define SQL_C_USHORT			SQL_C_SHORT+SQL_UNSIGNED_OFFSET
+#define SQL_C_UTINYINT			SQL_TINYINT+SQL_UNSIGNED_OFFSET
+#define SQL_C_BOOKMARK			SQL_C_ULONG
+
+/*
+ *  Extended data types override sql.h defined
+ */
+#undef	SQL_TYPE_MIN
+#define SQL_TYPE_MIN		SQL_BIT
+#define SQL_ALL_TYPES		0
+
+/*
+ *  SQL portable types for C - DATE, TIME, TIMESTAMP
+ */
+typedef struct _DATE_STRUCT
+  {
+    SWORD year;
+    UWORD month;
+    UWORD day;
+  }
+DATE_STRUCT;
+
+typedef struct _TIME_STRUCT
+  {
+    UWORD hour;
+    UWORD minute;
+    UWORD second;
+  }
+TIME_STRUCT;
+
+typedef struct _TIMESTAMP_STRUCT
+  {
+    SWORD year;
+    UWORD month;
+    UWORD day;
+    UWORD hour;
+    UWORD minute;
+    UWORD second;
+    UDWORD fraction;
+  }
+TIMESTAMP_STRUCT;
+
+typedef unsigned long int	BOOKMARK;
+
+/*
+ * ----------------------------------------------------------------------
+ *  Level 1 Functions
+ * ----------------------------------------------------------------------
+ */
+
+/*
+ *  SQLDriverConnect
+ */
+#define SQL_DRIVER_NOPROMPT 		0
+#define SQL_DRIVER_COMPLETE 		1
+#define SQL_DRIVER_PROMPT		2
+#define SQL_DRIVER_COMPLETE_REQUIRED	3
+
+/*
+ *  SQLGetData
+ */
+#define SQL_NO_TOTAL			(-4)
+
+/*
+ *  SQLBindParameter
+ */
+#define SQL_DEFAULT_PARAM		(-5)
+#define SQL_IGNORE			(-6)
+#define SQL_LEN_DATA_AT_EXEC_OFFSET	(-100)
+#define SQL_LEN_DATA_AT_EXEC(length) 	(-length+SQL_LEN_DATA_AT_EXEC_OFFSET)
+
+/*
+ *  SQLGetFunctions
+ */
+#define SQL_API_SQLALLOCCONNECT		1	/* Core Functions */
+#define SQL_API_SQLALLOCENV		2
+#define SQL_API_SQLALLOCSTMT		3
+#define SQL_API_SQLBINDCOL		4
+#define SQL_API_SQLCANCEL		5
+#define SQL_API_SQLCOLATTRIBUTES	6
+#define SQL_API_SQLCONNECT		7
+#define SQL_API_SQLDESCRIBECOL		8
+#define SQL_API_SQLDISCONNECT		9
+#define SQL_API_SQLERROR		10
+#define SQL_API_SQLEXECDIRECT		11
+#define SQL_API_SQLEXECUTE		12
+#define SQL_API_SQLFETCH		13
+#define SQL_API_SQLFREECONNECT		14
+#define SQL_API_SQLFREEENV		15
+#define SQL_API_SQLFREESTMT		16
+#define SQL_API_SQLGETCURSORNAME	17
+#define SQL_API_SQLNUMRESULTCOLS	18
+#define SQL_API_SQLPREPARE		19
+#define SQL_API_SQLROWCOUNT		20
+#define SQL_API_SQLSETCURSORNAME	21
+#define SQL_API_SQLSETPARAM		22
+#define SQL_API_SQLTRANSACT		23
+
+#define SQL_NUM_FUNCTIONS		23
+
+#define SQL_EXT_API_START		40
+
+#define SQL_API_SQLCOLUMNS		40	/* Level 1 Functions */
+#define SQL_API_SQLDRIVERCONNECT	41
+#define SQL_API_SQLGETCONNECTOPTION 	42
+#define SQL_API_SQLGETDATA		43
+#define SQL_API_SQLGETFUNCTIONS		44
+#define SQL_API_SQLGETINFO		45
+#define SQL_API_SQLGETSTMTOPTION	46
+#define SQL_API_SQLGETTYPEINFO		47
+#define SQL_API_SQLPARAMDATA		48
+#define SQL_API_SQLPUTDATA		49
+#define SQL_API_SQLSETCONNECTOPTION 	50
+#define SQL_API_SQLSETSTMTOPTION	51
+#define SQL_API_SQLSPECIALCOLUMNS	52
+#define SQL_API_SQLSTATISTICS		53
+#define SQL_API_SQLTABLES		54
+
+#define SQL_API_SQLBROWSECONNECT	55	/* Level 2 Functions */
+#define SQL_API_SQLCOLUMNPRIVILEGES 	56
+#define SQL_API_SQLDATASOURCES		57
+#define SQL_API_SQLDESCRIBEPARAM	58
+#define SQL_API_SQLEXTENDEDFETCH	59
+#define SQL_API_SQLFOREIGNKEYS		60
+#define SQL_API_SQLMORERESULTS		61
+#define SQL_API_SQLNATIVESQL		62
+#define SQL_API_SQLNUMPARAMS		63
+#define SQL_API_SQLPARAMOPTIONS		64
+#define SQL_API_SQLPRIMARYKEYS		65
+#define SQL_API_SQLPROCEDURECOLUMNS 	66
+#define SQL_API_SQLPROCEDURES		67
+#define SQL_API_SQLSETPOS		68
+#define SQL_API_SQLSETSCROLLOPTIONS 	69
+#define SQL_API_SQLTABLEPRIVILEGES	70
+
+#define SQL_API_SQLDRIVERS		71
+#define SQL_API_SQLBINDPARAMETER	72
+#define SQL_EXT_API_LAST		SQL_API_SQLBINDPARAMETER
+
+#define SQL_API_ALL_FUNCTIONS		0
+
+#define SQL_NUM_EXTENSIONS (SQL_EXT_API_LAST-SQL_EXT_API_START+1)
+
+/*
+ *  SQLGetInfo
+ */
+#define SQL_INFO_FIRST			0
+#define SQL_ACTIVE_CONNECTIONS		0
+#define SQL_ACTIVE_STATEMENTS		1
+#define SQL_DATA_SOURCE_NAME		2
+#define SQL_DRIVER_HDBC			3
+#define SQL_DRIVER_HENV			4
+#define SQL_DRIVER_HSTMT		5
+#define SQL_DRIVER_NAME			6
+#define SQL_DRIVER_VER			7
+#define SQL_FETCH_DIRECTION		8
+#define SQL_ODBC_API_CONFORMANCE	9
+#define SQL_ODBC_VER			10
+#define SQL_ROW_UPDATES			11
+#define SQL_ODBC_SAG_CLI_CONFORMANCE	12
+#define SQL_SERVER_NAME			13
+#define SQL_SEARCH_PATTERN_ESCAPE	14
+#define SQL_ODBC_SQL_CONFORMANCE	15
+#define SQL_DBMS_NAME			17
+#define SQL_DBMS_VER			18
+#define SQL_ACCESSIBLE_TABLES		19
+#define SQL_ACCESSIBLE_PROCEDURES	20
+#define SQL_PROCEDURES			21
+#define SQL_CONCAT_NULL_BEHAVIOR	22
+#define SQL_CURSOR_COMMIT_BEHAVIOR	23
+#define SQL_CURSOR_ROLLBACK_BEHAVIOR	24
+#define SQL_DATA_SOURCE_READ_ONLY	25
+#define SQL_DEFAULT_TXN_ISOLATION	26
+#define SQL_EXPRESSIONS_IN_ORDERBY	27
+#define SQL_IDENTIFIER_CASE		28
+#define SQL_IDENTIFIER_QUOTE_CHAR	29
+#define SQL_MAX_COLUMN_NAME_LEN		30
+#define SQL_MAX_CURSOR_NAME_LEN		31
+#define SQL_MAX_OWNER_NAME_LEN		32
+#define SQL_MAX_PROCEDURE_NAME_LEN	33
+#define SQL_MAX_QUALIFIER_NAME_LEN	34
+#define SQL_MAX_TABLE_NAME_LEN		35
+#define SQL_MULT_RESULT_SETS		36
+#define SQL_MULTIPLE_ACTIVE_TXN		37
+#define SQL_OUTER_JOINS			38
+#define SQL_OWNER_TERM			39
+#define SQL_PROCEDURE_TERM		40
+#define SQL_QUALIFIER_NAME_SEPARATOR	41
+#define SQL_QUALIFIER_TERM		42
+#define SQL_SCROLL_CONCURRENCY		43
+#define SQL_SCROLL_OPTIONS		44
+#define SQL_TABLE_TERM			45
+#define SQL_TXN_CAPABLE			46
+#define SQL_USER_NAME			47
+#define SQL_CONVERT_FUNCTIONS		48
+#define SQL_NUMERIC_FUNCTIONS		49
+#define SQL_STRING_FUNCTIONS		50
+#define SQL_SYSTEM_FUNCTIONS		51
+#define SQL_TIMEDATE_FUNCTIONS		52
+#define SQL_CONVERT_BIGINT		53
+#define SQL_CONVERT_BINARY		54
+#define SQL_CONVERT_BIT			55
+#define SQL_CONVERT_CHAR		56
+#define SQL_CONVERT_DATE		57
+#define SQL_CONVERT_DECIMAL		58
+#define SQL_CONVERT_DOUBLE		59
+#define SQL_CONVERT_FLOAT		60
+#define SQL_CONVERT_INTEGER		61
+#define SQL_CONVERT_LONGVARCHAR		62
+#define SQL_CONVERT_NUMERIC		63
+#define SQL_CONVERT_REAL		64
+#define SQL_CONVERT_SMALLINT		65
+#define SQL_CONVERT_TIME		66
+#define SQL_CONVERT_TIMESTAMP		67
+#define SQL_CONVERT_TINYINT		68
+#define SQL_CONVERT_VARBINARY		69
+#define SQL_CONVERT_VARCHAR		70
+#define SQL_CONVERT_LONGVARBINARY	71
+#define SQL_TXN_ISOLATION_OPTION	72
+#define SQL_ODBC_SQL_OPT_IEF		73
+
+/*
+ *  ODBC SDK 1.0 Additions
+ */
+#define SQL_CORRELATION_NAME		74
+#define SQL_NON_NULLABLE_COLUMNS	75
+
+/*
+ *  ODBC SDK 2.0 Additions
+ */
+#define SQL_DRIVER_HLIB 		76
+#define SQL_DRIVER_ODBC_VER 		77
+#define SQL_LOCK_TYPES			78
+#define SQL_POS_OPERATIONS		79
+#define SQL_POSITIONED_STATEMENTS	80
+#define SQL_GETDATA_EXTENSIONS		81
+#define SQL_BOOKMARK_PERSISTENCE	82
+#define SQL_STATIC_SENSITIVITY		83
+#define SQL_FILE_USAGE			84
+#define SQL_NULL_COLLATION		85
+#define SQL_ALTER_TABLE 		86
+#define SQL_COLUMN_ALIAS		87
+#define SQL_GROUP_BY			88
+#define SQL_KEYWORDS			89
+#define SQL_ORDER_BY_COLUMNS_IN_SELECT	90
+#define SQL_OWNER_USAGE 		91
+#define SQL_QUALIFIER_USAGE 		92
+#define SQL_QUOTED_IDENTIFIER_CASE	93
+#define SQL_SPECIAL_CHARACTERS		94
+#define SQL_SUBQUERIES			95
+#define SQL_UNION			96
+#define SQL_MAX_COLUMNS_IN_GROUP_BY 	97
+#define SQL_MAX_COLUMNS_IN_INDEX	98
+#define SQL_MAX_COLUMNS_IN_ORDER_BY 	99
+#define SQL_MAX_COLUMNS_IN_SELECT	100
+#define SQL_MAX_COLUMNS_IN_TABLE	101
+#define SQL_MAX_INDEX_SIZE		102
+#define SQL_MAX_ROW_SIZE_INCLUDES_LONG	103
+#define SQL_MAX_ROW_SIZE		104
+#define SQL_MAX_STATEMENT_LEN		105
+#define SQL_MAX_TABLES_IN_SELECT	106
+#define SQL_MAX_USER_NAME_LEN		107
+#define SQL_MAX_CHAR_LITERAL_LEN 	108
+#define SQL_TIMEDATE_ADD_INTERVALS	109
+#define SQL_TIMEDATE_DIFF_INTERVALS 	110
+#define SQL_NEED_LONG_DATA_LEN		111
+#define SQL_MAX_BINARY_LITERAL_LEN	112
+#define SQL_LIKE_ESCAPE_CLAUSE		113
+#define SQL_QUALIFIER_LOCATION		114
+
+/*
+ *  ODBC SDK 2.01 Additions
+ */
+#define SQL_OJ_CAPABILITIES 		65003	/* Temp value until ODBC 3.0 */
+
+#define SQL_INFO_LAST			SQL_QUALIFIER_LOCATION
+#define SQL_INFO_DRIVER_START		1000
+
+
+/*
+ *  SQL_CONVERT_* bitmask values
+ */
+#define SQL_CVT_CHAR			0x00000001L
+#define SQL_CVT_NUMERIC 		0x00000002L
+#define SQL_CVT_DECIMAL 		0x00000004L
+#define SQL_CVT_INTEGER 		0x00000008L
+#define SQL_CVT_SMALLINT		0x00000010L
+#define SQL_CVT_FLOAT			0x00000020L
+#define SQL_CVT_REAL			0x00000040L
+#define SQL_CVT_DOUBLE			0x00000080L
+#define SQL_CVT_VARCHAR 		0x00000100L
+#define SQL_CVT_LONGVARCHAR 		0x00000200L
+#define SQL_CVT_BINARY			0x00000400L
+#define SQL_CVT_VARBINARY		0x00000800L
+#define SQL_CVT_BIT 			0x00001000L
+#define SQL_CVT_TINYINT 		0x00002000L
+#define SQL_CVT_BIGINT			0x00004000L
+#define SQL_CVT_DATE			0x00008000L
+#define SQL_CVT_TIME			0x00010000L
+#define SQL_CVT_TIMESTAMP		0x00020000L
+#define SQL_CVT_LONGVARBINARY		0x00040000L
+
+/*
+ *  SQL_CONVERT_FUNCTIONS
+ */
+#define SQL_FN_CVT_CONVERT		0x00000001L
+
+/*
+ *  SQL_STRING_FUNCTIONS
+ */
+#define SQL_FN_STR_CONCAT		0x00000001L
+#define SQL_FN_STR_INSERT		0x00000002L
+#define SQL_FN_STR_LEFT 		0x00000004L
+#define SQL_FN_STR_LTRIM		0x00000008L
+#define SQL_FN_STR_LENGTH		0x00000010L
+#define SQL_FN_STR_LOCATE		0x00000020L
+#define SQL_FN_STR_LCASE		0x00000040L
+#define SQL_FN_STR_REPEAT		0x00000080L
+#define SQL_FN_STR_REPLACE		0x00000100L
+#define SQL_FN_STR_RIGHT		0x00000200L
+#define SQL_FN_STR_RTRIM		0x00000400L
+#define SQL_FN_STR_SUBSTRING		0x00000800L
+#define SQL_FN_STR_UCASE		0x00001000L
+#define SQL_FN_STR_ASCII		0x00002000L
+#define SQL_FN_STR_CHAR 		0x00004000L
+#define SQL_FN_STR_DIFFERENCE		0x00008000L
+#define SQL_FN_STR_LOCATE_2 		0x00010000L
+#define SQL_FN_STR_SOUNDEX		0x00020000L
+#define SQL_FN_STR_SPACE		0x00040000L
+
+/*
+ *  SQL_NUMERIC_FUNCTIONS
+ */
+#define SQL_FN_NUM_ABS			0x00000001L
+#define SQL_FN_NUM_ACOS 		0x00000002L
+#define SQL_FN_NUM_ASIN 		0x00000004L
+#define SQL_FN_NUM_ATAN 		0x00000008L
+#define SQL_FN_NUM_ATAN2		0x00000010L
+#define SQL_FN_NUM_CEILING		0x00000020L
+#define SQL_FN_NUM_COS			0x00000040L
+#define SQL_FN_NUM_COT			0x00000080L
+#define SQL_FN_NUM_EXP			0x00000100L
+#define SQL_FN_NUM_FLOOR		0x00000200L
+#define SQL_FN_NUM_LOG			0x00000400L
+#define SQL_FN_NUM_MOD			0x00000800L
+#define SQL_FN_NUM_SIGN		 	0x00001000L
+#define SQL_FN_NUM_SIN			0x00002000L
+#define SQL_FN_NUM_SQRT		 	0x00004000L
+#define SQL_FN_NUM_TAN			0x00008000L
+#define SQL_FN_NUM_PI			0x00010000L
+#define SQL_FN_NUM_RAND		 	0x00020000L
+#define SQL_FN_NUM_DEGREES		0x00040000L
+#define SQL_FN_NUM_LOG10		0x00080000L
+#define SQL_FN_NUM_POWER		0x00100000L
+#define SQL_FN_NUM_RADIANS		0x00200000L
+#define SQL_FN_NUM_ROUND		0x00400000L
+#define SQL_FN_NUM_TRUNCATE 		0x00800000L
+
+/*
+ *  SQL_TIMEDATE_FUNCTIONS
+ */
+#define SQL_FN_TD_NOW			0x00000001L
+#define SQL_FN_TD_CURDATE		0x00000002L
+#define SQL_FN_TD_DAYOFMONTH		0x00000004L
+#define SQL_FN_TD_DAYOFWEEK 		0x00000008L
+#define SQL_FN_TD_DAYOFYEAR 		0x00000010L
+#define SQL_FN_TD_MONTH 		0x00000020L
+#define SQL_FN_TD_QUARTER		0x00000040L
+#define SQL_FN_TD_WEEK			0x00000080L
+#define SQL_FN_TD_YEAR			0x00000100L
+#define SQL_FN_TD_CURTIME		0x00000200L
+#define SQL_FN_TD_HOUR			0x00000400L
+#define SQL_FN_TD_MINUTE		0x00000800L
+#define SQL_FN_TD_SECOND		0x00001000L
+#define SQL_FN_TD_TIMESTAMPADD		0x00002000L
+#define SQL_FN_TD_TIMESTAMPDIFF 	0x00004000L
+#define SQL_FN_TD_DAYNAME		0x00008000L
+#define SQL_FN_TD_MONTHNAME 		0x00010000L
+
+/*
+ *  SQL_SYSTEM_FUNCTIONS
+ */
+#define SQL_FN_SYS_USERNAME 		0x00000001L
+#define SQL_FN_SYS_DBNAME		0x00000002L
+#define SQL_FN_SYS_IFNULL		0x00000004L
+
+/*
+ *  SQL_TIMEDATE_ADD_INTERVALS
+ *  SQL_TIMEDATE_DIFF_INTERVALS
+ */
+#define SQL_FN_TSI_FRAC_SECOND		0x00000001L
+#define SQL_FN_TSI_SECOND		0x00000002L
+#define SQL_FN_TSI_MINUTE		0x00000004L
+#define SQL_FN_TSI_HOUR 		0x00000008L
+#define SQL_FN_TSI_DAY			0x00000010L
+#define SQL_FN_TSI_WEEK 		0x00000020L
+#define SQL_FN_TSI_MONTH		0x00000040L
+#define SQL_FN_TSI_QUARTER		0x00000080L
+#define SQL_FN_TSI_YEAR 		0x00000100L
+
+/*
+ *  SQL_ODBC_API_CONFORMANCE
+ */
+#define SQL_OAC_NONE			0x0000
+#define SQL_OAC_LEVEL1			0x0001
+#define SQL_OAC_LEVEL2			0x0002
+
+/*
+ * SQL_ODBC_SAG_CLI_CONFORMANCE
+ */
+#define SQL_OSCC_NOT_COMPLIANT		0x0000
+#define SQL_OSCC_COMPLIANT		0x0001
+
+/*
+ *  SQL_ODBC_SQL_CONFORMANCE
+ */
+#define SQL_OSC_MINIMUM 		0x0000
+#define SQL_OSC_CORE			0x0001
+#define SQL_OSC_EXTENDED		0x0002
+
+/*
+ *  SQL_CONCAT_NULL_BEHAVIOR
+ */
+#define SQL_CB_NULL 			0x0000
+#define SQL_CB_NON_NULL		 	0x0001
+
+/*
+ *  SQL_CURSOR_COMMIT_BEHAVIOR
+ *  SQL_CURSOR_ROLLBACK_BEHAVIOR
+ */
+#define SQL_CB_DELETE			0x0000
+#define SQL_CB_CLOSE			0x0001
+#define SQL_CB_PRESERVE			0x0002
+
+/*
+ *  SQL_IDENTIFIER_CASE
+ */
+#define SQL_IC_UPPER			0x0001
+#define SQL_IC_LOWER			0x0002
+#define SQL_IC_SENSITIVE		0x0003
+#define SQL_IC_MIXED			0x0004
+
+/*
+ *  SQL_TXN_CAPABLE
+ */
+#define SQL_TC_NONE 			0x0000
+#define SQL_TC_DML			0x0001
+#define SQL_TC_ALL			0x0002
+#define SQL_TC_DDL_COMMIT		0x0003
+#define SQL_TC_DDL_IGNORE		0x0004
+
+/*
+ *  SQL_SCROLL_OPTIONS
+ */
+#define SQL_SO_FORWARD_ONLY 		0x00000001L
+#define SQL_SO_KEYSET_DRIVEN		0x00000002L
+#define SQL_SO_DYNAMIC			0x00000004L
+#define SQL_SO_MIXED			0x00000008L
+#define SQL_SO_STATIC			0x00000010L
+
+/*
+ * SQL_SCROLL_CONCURRENCY
+ */
+#define SQL_SCCO_READ_ONLY		0x00000001L
+#define SQL_SCCO_LOCK			0x00000002L
+#define SQL_SCCO_OPT_ROWVER 		0x00000004L
+#define SQL_SCCO_OPT_VALUES 		0x00000008L
+
+/*
+ *  SQL_FETCH_DIRECTION
+ */
+#define SQL_FD_FETCH_NEXT		0x00000001L
+#define SQL_FD_FETCH_FIRST		0x00000002L
+#define SQL_FD_FETCH_LAST		0x00000004L
+#define SQL_FD_FETCH_PRIOR		0x00000008L
+#define SQL_FD_FETCH_ABSOLUTE		0x00000010L
+#define SQL_FD_FETCH_RELATIVE		0x00000020L
+#define SQL_FD_FETCH_RESUME 		0x00000040L
+#define SQL_FD_FETCH_BOOKMARK		0x00000080L
+
+/*
+ *  SQL_TXN_ISOLATION_OPTION
+ */
+#define SQL_TXN_READ_UNCOMMITTED	0x00000001L
+#define SQL_TXN_READ_COMMITTED		0x00000002L
+#define SQL_TXN_REPEATABLE_READ 	0x00000004L
+#define SQL_TXN_SERIALIZABLE		0x00000008L
+#define SQL_TXN_VERSIONING		0x00000010L
+
+/*
+ *  SQL_CORRELATION_NAME
+ */
+#define SQL_CN_NONE 			0x0000
+#define SQL_CN_DIFFERENT		0x0001
+#define SQL_CN_ANY			0x0002
+
+/*
+ * SQL_NON_NULLABLE_COLUMNS
+ */
+#define SQL_NNC_NULL			0x0000
+#define SQL_NNC_NON_NULL		0x0001
+
+/*
+ *  SQL_NULL_COLLATION
+ */
+#define SQL_NC_HIGH 			0x0000
+#define SQL_NC_LOW			0x0001
+#define SQL_NC_START			0x0002
+#define SQL_NC_END			0x0004
+
+/*
+ * SQL_FILE_USAGE
+ */
+#define SQL_FILE_NOT_SUPPORTED		0x0000
+#define SQL_FILE_TABLE			0x0001
+#define SQL_FILE_QUALIFIER		0x0002
+
+/*
+ *  SQL_GETDATA_EXTENSIONS
+ */
+#define SQL_GD_ANY_COLUMN		0x00000001L
+#define SQL_GD_ANY_ORDER		0x00000002L
+#define SQL_GD_BLOCK			0x00000004L
+#define SQL_GD_BOUND			0x00000008L
+
+/*
+ * SQL_ALTER_TABLE
+ */
+#define SQL_AT_ADD_COLUMN		0x00000001L
+#define SQL_AT_DROP_COLUMN		0x00000002L
+
+/*
+ *  SQL_POSITIONED_STATEMENTS
+ */
+#define SQL_PS_POSITIONED_DELETE	0x00000001L
+#define SQL_PS_POSITIONED_UPDATE	0x00000002L
+#define SQL_PS_SELECT_FOR_UPDATE	0x00000004L
+
+/*
+ *  SQL_GROUP_BY
+ */
+#define SQL_GB_NOT_SUPPORTED		0x0000
+#define SQL_GB_GROUP_BY_EQUALS_SELECT	0x0001
+#define SQL_GB_GROUP_BY_CONTAINS_SELECT	0x0002
+#define SQL_GB_NO_RELATION		0x0003
+
+/*
+ *  SQL_OWNER_USAGE
+ */
+#define SQL_OU_DML_STATEMENTS		0x00000001L
+#define SQL_OU_PROCEDURE_INVOCATION	0x00000002L
+#define SQL_OU_TABLE_DEFINITION 	0x00000004L
+#define SQL_OU_INDEX_DEFINITION 	0x00000008L
+#define SQL_OU_PRIVILEGE_DEFINITION	0x00000010L
+
+/*
+ * SQL_QUALIFIER_USAGE
+ */
+#define SQL_QU_DML_STATEMENTS		0x00000001L
+#define SQL_QU_PROCEDURE_INVOCATION 	0x00000002L
+#define SQL_QU_TABLE_DEFINITION 	0x00000004L
+#define SQL_QU_INDEX_DEFINITION 	0x00000008L
+#define SQL_QU_PRIVILEGE_DEFINITION 	0x00000010L
+
+/*
+ *  SQL_SUBQUERIES
+ */
+#define SQL_SQ_COMPARISON		0x00000001L
+#define SQL_SQ_EXISTS			0x00000002L
+#define SQL_SQ_IN			0x00000004L
+#define SQL_SQ_QUANTIFIED		0x00000008L
+#define SQL_SQ_CORRELATED_SUBQUERIES	0x00000010L
+
+/*
+ *  SQL_UNION
+ */
+#define SQL_U_UNION			0x00000001L
+#define SQL_U_UNION_ALL			0x00000002L
+
+/*
+ *  SQL_BOOKMARK_PERSISTENCE
+ */
+#define SQL_BP_CLOSE			0x00000001L
+#define SQL_BP_DELETE			0x00000002L
+#define SQL_BP_DROP 			0x00000004L
+#define SQL_BP_TRANSACTION		0x00000008L
+#define SQL_BP_UPDATE			0x00000010L
+#define SQL_BP_OTHER_HSTMT		0x00000020L
+#define SQL_BP_SCROLL			0x00000040L
+
+/*
+ * SQL_STATIC_SENSITIVITY
+ */
+#define SQL_SS_ADDITIONS		0x00000001L
+#define SQL_SS_DELETIONS		0x00000002L
+#define SQL_SS_UPDATES			0x00000004L
+
+/*
+ *  SQL_LOCK_TYPES
+ */
+#define SQL_LCK_NO_CHANGE		0x00000001L
+#define SQL_LCK_EXCLUSIVE		0x00000002L
+#define SQL_LCK_UNLOCK			0x00000004L
+
+/*
+ *  SQL_POS_OPERATIONS
+ */
+#define SQL_POS_POSITION		0x00000001L
+#define SQL_POS_REFRESH 		0x00000002L
+#define SQL_POS_UPDATE			0x00000004L
+#define SQL_POS_DELETE			0x00000008L
+#define SQL_POS_ADD			0x00000010L
+
+/*
+ *  SQL_QUALIFIER_LOCATION
+ */
+#define SQL_QL_START			0x0001L
+#define SQL_QL_END			0x0002L
+
+/*
+ *  SQL_OJ_CAPABILITIES
+ */
+#define SQL_OJ_LEFT			0x00000001L
+#define SQL_OJ_RIGHT			0x00000002L
+#define SQL_OJ_FULL			0x00000004L
+#define SQL_OJ_NESTED			0x00000008L
+#define SQL_OJ_NOT_ORDERED		0x00000010L
+#define SQL_OJ_INNER			0x00000020L
+#define SQL_OJ_ALL_COMPARISON_OPS	0x00000040L
+
+/*
+ *  SQLGetStmtOption/SQLSetStmtOption
+ */
+#define SQL_QUERY_TIMEOUT		0
+#define SQL_MAX_ROWS			1
+#define SQL_NOSCAN			2
+#define SQL_MAX_LENGTH			3
+#define SQL_ASYNC_ENABLE		4
+#define SQL_BIND_TYPE			5
+#define SQL_CURSOR_TYPE 		6
+#define SQL_CONCURRENCY 		7
+#define SQL_KEYSET_SIZE 		8
+#define SQL_ROWSET_SIZE 		9
+#define SQL_SIMULATE_CURSOR 		10
+#define SQL_RETRIEVE_DATA		11
+#define SQL_USE_BOOKMARKS		12
+#define SQL_GET_BOOKMARK		13
+#define SQL_ROW_NUMBER			14
+
+#define SQL_STMT_OPT_MIN		SQL_QUERY_TIMEOUT
+#define SQL_STMT_OPT_MAX		SQL_ROW_NUMBER
+
+
+/*
+ * SQL_QUERY_TIMEOUT
+ */
+#define SQL_QUERY_TIMEOUT_DEFAULT	0UL
+
+/*
+ *  SQL_MAX_ROWS
+ */
+#define SQL_MAX_ROWS_DEFAULT		0UL
+
+/*
+ *  SQL_NOSCAN
+ */
+#define SQL_NOSCAN_OFF			0UL	/* 1.0 FALSE */
+#define SQL_NOSCAN_ON			1UL	/* 1.0 TRUE */
+#define SQL_NOSCAN_DEFAULT		SQL_NOSCAN_OFF
+
+/*
+ *  SQL_MAX_LENGTH
+ */
+#define SQL_MAX_LENGTH_DEFAULT		0UL
+
+/*
+ *  SQL_ASYNC_ENABLE
+ */
+#define SQL_ASYNC_ENABLE_OFF		0UL
+#define SQL_ASYNC_ENABLE_ON		1UL
+#define SQL_ASYNC_ENABLE_DEFAULT	SQL_ASYNC_ENABLE_OFF
+
+/*
+ *  SQL_BIND_TYPE
+ */
+#define SQL_BIND_BY_COLUMN		0UL
+#define SQL_BIND_TYPE_DEFAULT		SQL_BIND_BY_COLUMN
+
+/*
+ *  SQL_CONCURRENCY
+ */
+#define SQL_CONCUR_READ_ONLY		1
+#define SQL_CONCUR_LOCK 		2
+#define SQL_CONCUR_ROWVER		3
+#define SQL_CONCUR_VALUES		4
+#define SQL_CONCUR_DEFAULT		SQL_CONCUR_READ_ONLY
+
+/*
+ *  SQL_CURSOR_TYPE
+ */
+#define SQL_CURSOR_FORWARD_ONLY 	0UL
+#define SQL_CURSOR_KEYSET_DRIVEN	1UL
+#define SQL_CURSOR_DYNAMIC		2UL
+#define SQL_CURSOR_STATIC		3UL
+#define SQL_CURSOR_TYPE_DEFAULT		SQL_CURSOR_FORWARD_ONLY
+
+/*
+ *  SQL_ROWSET_SIZE
+ */
+#define SQL_ROWSET_SIZE_DEFAULT 	1UL
+
+/*
+ *  SQL_KEYSET_SIZE
+ */
+#define SQL_KEYSET_SIZE_DEFAULT		0UL
+
+/*
+ *  SQL_SIMULATE_CURSOR
+ */
+#define SQL_SC_NON_UNIQUE		0UL
+#define SQL_SC_TRY_UNIQUE		1UL
+#define SQL_SC_UNIQUE			2UL
+
+/*
+ *  SQL_RETRIEVE_DATA
+ */
+#define SQL_RD_OFF			0UL
+#define SQL_RD_ON			1UL
+#define SQL_RD_DEFAULT			SQL_RD_ON
+
+/*
+ *  SQL_USE_BOOKMARKS
+ */
+#define SQL_UB_OFF			0UL
+#define SQL_UB_ON			1UL
+#define SQL_UB_DEFAULT			SQL_UB_OFF
+
+/*
+ *  SQLSetConnectOption/SQLGetConnectOption
+ */
+#define SQL_ACCESS_MODE		 	101
+#define SQL_AUTOCOMMIT			102
+#define SQL_LOGIN_TIMEOUT		103
+#define SQL_OPT_TRACE			104
+#define SQL_OPT_TRACEFILE		105
+#define SQL_TRANSLATE_DLL		106
+#define SQL_TRANSLATE_OPTION		107
+#define SQL_TXN_ISOLATION		108
+#define SQL_CURRENT_QUALIFIER		109
+#define SQL_ODBC_CURSORS		110
+#define SQL_QUIET_MODE			111
+#define SQL_PACKET_SIZE		 	112
+
+#define	SQL_CONN_OPT_MIN		SQL_ACCESS_MODE
+#define SQL_CONN_OPT_MAX		SQL_PACKET_SIZE
+#define SQL_CONNECT_OPT_DRVR_START	1000
+
+
+/*
+ *  SQL_ACCESS_MODE
+ */
+#define SQL_MODE_READ_WRITE 		0UL
+#define SQL_MODE_READ_ONLY		1UL
+#define SQL_MODE_DEFAULT		SQL_MODE_READ_WRITE
+
+/*
+ *  SQL_AUTOCOMMIT
+ */
+#define SQL_AUTOCOMMIT_OFF		0UL
+#define SQL_AUTOCOMMIT_ON		1UL
+#define SQL_AUTOCOMMIT_DEFAULT		SQL_AUTOCOMMIT_ON
+
+/*
+ *  SQL_LOGIN_TIMEOUT
+ */
+#define SQL_LOGIN_TIMEOUT_DEFAULT	15UL
+
+/*
+ *  SQL_OPT_TRACE
+ */
+#define SQL_OPT_TRACE_OFF		0UL
+#define SQL_OPT_TRACE_ON		1UL
+#define SQL_OPT_TRACE_DEFAULT		SQL_OPT_TRACE_OFF
+#define SQL_OPT_TRACE_FILE_DEFAULT	"odbc.log"
+
+/*
+ *  SQL_ODBC_CURSORS
+ */
+#define SQL_CUR_USE_IF_NEEDED		0UL
+#define SQL_CUR_USE_ODBC		1UL
+#define SQL_CUR_USE_DRIVER		2UL
+#define SQL_CUR_DEFAULT 		SQL_CUR_USE_DRIVER
+
+/*
+ *  SQLSpecialColumns - Column types and scopes
+ */
+#define SQL_BEST_ROWID			1
+#define SQL_ROWVER			2
+
+#define SQL_SCOPE_CURROW		0
+#define SQL_SCOPE_TRANSACTION		1
+#define SQL_SCOPE_SESSION		2
+
+/*
+ *  SQLSetPos
+ */
+#define SQL_ENTIRE_ROWSET		0
+
+/*
+ *  SQLSetPos
+ */
+#define SQL_POSITION			0
+#define SQL_REFRESH 			1
+#define SQL_UPDATE			2
+#define SQL_DELETE			3
+#define SQL_ADD				4
+
+/*
+ *  SQLSetPos
+ */
+#define SQL_LOCK_NO_CHANGE		0
+#define SQL_LOCK_EXCLUSIVE		1
+#define SQL_LOCK_UNLOCK 		2
+
+/*
+ *  SQLSetPos
+ */
+#define SQL_POSITION_TO(hstmt,irow) 	\
+    SQLSetPos(hstmt,irow,SQL_POSITION,SQL_LOCK_NO_CHANGE)
+#define SQL_LOCK_RECORD(hstmt,irow,fLock) \
+    SQLSetPos(hstmt,irow,SQL_POSITION,fLock)
+#define SQL_REFRESH_RECORD(hstmt,irow,fLock) \
+    SQLSetPos(hstmt,irow,SQL_REFRESH,fLock)
+#define SQL_UPDATE_RECORD(hstmt,irow) \
+    SQLSetPos(hstmt,irow,SQL_UPDATE,SQL_LOCK_NO_CHANGE)
+#define SQL_DELETE_RECORD(hstmt,irow) \
+    SQLSetPos(hstmt,irow,SQL_DELETE,SQL_LOCK_NO_CHANGE)
+#define SQL_ADD_RECORD(hstmt,irow) \
+    SQLSetPos(hstmt,irow,SQL_ADD,SQL_LOCK_NO_CHANGE)
+
+/*
+ *  All the ODBC keywords
+ */
+#define SQL_ODBC_KEYWORDS \
+"ABSOLUTE,ACTION,ADA,ADD,ALL,ALLOCATE,ALTER,AND,ANY,ARE,AS,"\
+"ASC,ASSERTION,AT,AUTHORIZATION,AVG,"\
+"BEGIN,BETWEEN,BIT,BIT_LENGTH,BOTH,BY,CASCADE,CASCADED,CASE,CAST,CATALOG,"\
+"CHAR,CHAR_LENGTH,CHARACTER,CHARACTER_LENGTH,CHECK,CLOSE,COALESCE,"\
+"COBOL,COLLATE,COLLATION,COLUMN,COMMIT,CONNECT,CONNECTION,CONSTRAINT,"\
+"CONSTRAINTS,CONTINUE,CONVERT,CORRESPONDING,COUNT,CREATE,CROSS,CURRENT,"\
+"CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,"\
+"DATE,DAY,DEALLOCATE,DEC,DECIMAL,DECLARE,DEFAULT,DEFERRABLE,"\
+"DEFERRED,DELETE,DESC,DESCRIBE,DESCRIPTOR,DIAGNOSTICS,DISCONNECT,"\
+"DISTINCT,DOMAIN,DOUBLE,DROP,"\
+"ELSE,END,END-EXEC,ESCAPE,EXCEPT,EXCEPTION,EXEC,EXECUTE,"\
+"EXISTS,EXTERNAL,EXTRACT,"\
+"FALSE,FETCH,FIRST,FLOAT,FOR,FOREIGN,FORTRAN,FOUND,FROM,FULL,"\
+"GET,GLOBAL,GO,GOTO,GRANT,GROUP,HAVING,HOUR,"\
+"IDENTITY,IMMEDIATE,IN,INCLUDE,INDEX,INDICATOR,INITIALLY,INNER,"\
+"INPUT,INSENSITIVE,INSERT,INTEGER,INTERSECT,INTERVAL,INTO,IS,ISOLATION,"\
+"JOIN,KEY,LANGUAGE,LAST,LEADING,LEFT,LEVEL,LIKE,LOCAL,LOWER,"\
+"MATCH,MAX,MIN,MINUTE,MODULE,MONTH,MUMPS,"\
+"NAMES,NATIONAL,NATURAL,NCHAR,NEXT,NO,NONE,NOT,NULL,NULLIF,NUMERIC,"\
+"OCTET_LENGTH,OF,ON,ONLY,OPEN,OPTION,OR,ORDER,OUTER,OUTPUT,OVERLAPS,"\
+"PAD,PARTIAL,PASCAL,PLI,POSITION,PRECISION,PREPARE,PRESERVE,"\
+"PRIMARY,PRIOR,PRIVILEGES,PROCEDURE,PUBLIC,"\
+"REFERENCES,RELATIVE,RESTRICT,REVOKE,RIGHT,ROLLBACK,ROWS,"\
+"SCHEMA,SCROLL,SECOND,SECTION,SELECT,SEQUENCE,SESSION,SESSION_USER,SET,SIZE,"\
+"SMALLINT,SOME,SPACE,SQL,SQLCA,SQLCODE,SQLERROR,SQLSTATE,SQLWARNING,"\
+"SUBSTRING,SUM,SYSTEM_USER,"\
+"TABLE,TEMPORARY,THEN,TIME,TIMESTAMP,TIMEZONE_HOUR,TIMEZONE_MINUTE,"\
+"TO,TRAILING,TRANSACTION,TRANSLATE,TRANSLATION,TRIM,TRUE,"\
+"UNION,UNIQUE,UNKNOWN,UPDATE,UPPER,USAGE,USER,USING,"\
+"VALUE,,VARCHAR,VARYING,VIEW,WHEN,WHENEVER,WHERE,WITH,WORK,YEAR"
+
+/*
+ * ----------------------------------------------------------------------
+ *  Level 2 Functions
+ * ----------------------------------------------------------------------
+ */
+
+/*
+ *  SQLExtendedFetch - fFetchType
+ */
+#define SQL_FETCH_NEXT			1
+#define SQL_FETCH_FIRST 		2
+#define SQL_FETCH_LAST			3
+#define SQL_FETCH_PRIOR			4
+#define SQL_FETCH_ABSOLUTE		5
+#define SQL_FETCH_RELATIVE		6
+#define SQL_FETCH_BOOKMARK		8
+
+/*
+ *  SQLExtendedFetch - rgfRowStatus
+ */
+#define SQL_ROW_SUCCESS 		0
+#define SQL_ROW_DELETED 		1
+#define SQL_ROW_UPDATED 		2
+#define SQL_ROW_NOROW			3
+#define SQL_ROW_ADDED			4
+#define SQL_ROW_ERROR			5
+
+/*
+ *  SQLForeignKeys - UPDATE_RULE/DELETE_RULE
+ */
+#define SQL_CASCADE 			0
+#define SQL_RESTRICT			1
+#define SQL_SET_NULL			2
+
+/*
+ *  SQLBindParameter - fParamType
+ *  SQLProcedureColumns - COLUMN_TYPE
+ */
+#define SQL_PARAM_TYPE_UNKNOWN		0
+#define SQL_PARAM_INPUT			1
+#define SQL_PARAM_INPUT_OUTPUT		2
+#define SQL_RESULT_COL			3
+#define SQL_PARAM_OUTPUT		4
+#define SQL_RETURN_VALUE		5
+
+/*
+ *  SQLSetParam to SQLBindParameter conversion
+ */
+#define SQL_PARAM_TYPE_DEFAULT		SQL_PARAM_INPUT_OUTPUT
+#define SQL_SETPARAM_VALUE_MAX		(-1L)
+
+/*
+ *  SQLStatistics - fUnique
+ */
+#define SQL_INDEX_UNIQUE		0
+#define SQL_INDEX_ALL			1
+
+/*
+ *  SQLStatistics - fAccuracy
+ */
+#define SQL_QUICK			0
+#define SQL_ENSURE			1
+
+/*
+ *  SQLStatistics - TYPE
+ */
+#define SQL_TABLE_STAT			0
+#define SQL_INDEX_CLUSTERED 		1
+#define SQL_INDEX_HASHED		2
+#define SQL_INDEX_OTHER 		3
+
+/*
+ *  SQLProcedures - PROCEDURE_TYPE
+ */
+#define SQL_PT_UNKNOWN			0
+#define SQL_PT_PROCEDURE		1
+#define SQL_PT_FUNCTION 		2
+
+/*
+ *  SQLSpecialColumns - PSEUDO_COLUMN
+ */
+#define SQL_PC_UNKNOWN			0
+#define SQL_PC_NOT_PSEUDO		1
+#define SQL_PC_PSEUDO			2
+
+/*
+ *  Deprecated defines from prior versions of ODBC
+ */
+#define SQL_DATABASE_NAME 		16
+#define SQL_FD_FETCH_PREV		SQL_FD_FETCH_PRIOR
+#define SQL_FETCH_PREV			SQL_FETCH_PRIOR
+#define SQL_CONCUR_TIMESTAMP		SQL_CONCUR_ROWVER
+#define SQL_SCCO_OPT_TIMESTAMP		SQL_SCCO_OPT_ROWVER
+#define SQL_CC_DELETE			SQL_CB_DELETE
+#define SQL_CR_DELETE			SQL_CB_DELETE
+#define SQL_CC_CLOSE			SQL_CB_CLOSE
+#define SQL_CR_CLOSE			SQL_CB_CLOSE
+#define SQL_CC_PRESERVE 		SQL_CB_PRESERVE
+#define SQL_CR_PRESERVE 		SQL_CB_PRESERVE
+#define SQL_FETCH_RESUME		7
+#define SQL_SCROLL_FORWARD_ONLY 	0L
+#define SQL_SCROLL_KEYSET_DRIVEN	(-1L)
+#define SQL_SCROLL_DYNAMIC		(-2L)
+#define SQL_SCROLL_STATIC		(-3L)
+#define SQL_PC_NON_PSEUDO		SQL_PC_NOT_PSEUDO
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ *  Level 1 function prototypes
+ */
+RETCODE SQL_API SQLColumns (HSTMT hstmt, UCHAR FAR * szTableQualifier,
+    SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
+    UCHAR FAR * szTableName, SWORD cbTableName, UCHAR FAR * szColumnName,
+    SWORD cbColumnName);
+RETCODE SQL_API SQLDriverConnect (HDBC hdbc, SQLHWND hwnd,  //glt
+    UCHAR FAR * szConnStrIn, SWORD cbConnStrIn, UCHAR FAR * szConnStrOut,
+    SWORD cbConnStrOutMax, SWORD FAR * pcbConnStrOut, UWORD fDriverCompletion);
+RETCODE SQL_API SQLGetConnectOption (HDBC hdbc, UWORD fOption, PTR pvParam);
+RETCODE SQL_API SQLGetData (HSTMT hstmt, UWORD icol, SWORD fCType,
+    PTR rgbValue, SDWORD cbValueMax, SDWORD FAR * pcbValue);
+RETCODE SQL_API SQLGetFunctions (HDBC hdbc, UWORD fFunction,
+    UWORD FAR * pfExists);
+RETCODE SQL_API SQLGetInfo (HDBC hdbc, UWORD fInfoType, PTR rgbInfoValue,
+    SWORD cbInfoValueMax, SWORD FAR * pcbInfoValue);
+RETCODE SQL_API SQLGetStmtOption (HSTMT hstmt, UWORD fOption, PTR pvParam);
+RETCODE SQL_API SQLGetTypeInfo (HSTMT hstmt, SWORD fSqlType);
+RETCODE SQL_API SQLParamData (HSTMT hstmt, PTR FAR * prgbValue);
+RETCODE SQL_API SQLPutData (HSTMT hstmt, PTR rgbValue, SDWORD cbValue);
+RETCODE SQL_API SQLSetConnectOption (HDBC hdbc, UWORD fOption, UDWORD vParam);
+RETCODE SQL_API SQLSetStmtOption (HSTMT hstmt, UWORD fOption, UDWORD vParam);
+RETCODE SQL_API SQLSpecialColumns (HSTMT hstmt, UWORD fColType,
+    UCHAR FAR * szTableQualifier, SWORD cbTableQualifier,
+    UCHAR FAR * szTableOwner, SWORD cbTableOwner, UCHAR FAR * szTableName,
+    SWORD cbTableName, UWORD fScope, UWORD fNullable);
+RETCODE SQL_API SQLStatistics (HSTMT hstmt, UCHAR FAR * szTableQualifier,
+    SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
+    UCHAR FAR * szTableName, SWORD cbTableName, UWORD fUnique, UWORD fAccuracy);
+RETCODE SQL_API SQLTables (HSTMT hstmt, UCHAR FAR * szTableQualifier,
+    SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
+    UCHAR FAR * szTableName, SWORD cbTableName, UCHAR FAR * szTableType,
+    SWORD cbTableType);
+
+/*
+ *  Level 2 function prototypes
+ */
+RETCODE SQL_API SQLBrowseConnect (HDBC hdbc, 
+    UCHAR FAR * szConnStrIn, SWORD cbConnStrIn, UCHAR FAR * szConnStrOut, 
+    SWORD cbConnStrOutMax, SWORD FAR * pcbConnStrOut);
+RETCODE SQL_API SQLColumnPrivileges (HSTMT hstmt,
+    UCHAR FAR * szTableQualifier, SWORD cbTableQualifier,
+    UCHAR FAR * szTableOwner, SWORD cbTableOwner, UCHAR FAR * szTableName,
+    SWORD cbTableName, UCHAR FAR * szColumnName, SWORD cbColumnName);
+RETCODE SQL_API SQLDataSources (HENV henv, UWORD fDirection,
+    UCHAR FAR * szDSN, SWORD cbDSNMax, SWORD FAR * pcbDSN,
+    UCHAR FAR * szDescription, SWORD cbDescriptionMax,
+    SWORD FAR * pcbDescription);
+RETCODE SQL_API SQLDescribeParam (HSTMT hstmt, UWORD ipar,
+    SWORD FAR * pfSqlType, UDWORD FAR * pcbColDef, SWORD FAR * pibScale,
+    SWORD FAR * pfNullable);
+RETCODE SQL_API SQLExtendedFetch (HSTMT hstmt, UWORD fFetchType, SDWORD irow,
+    UDWORD FAR * pcrow, UWORD FAR * rgfRowStatus);
+RETCODE SQL_API SQLForeignKeys (HSTMT hstmt, UCHAR FAR * szPkTableQualifier,
+    SWORD cbPkTableQualifier, UCHAR FAR * szPkTableOwner, SWORD cbPkTableOwner,
+    UCHAR FAR * szPkTableName, SWORD cbPkTableName,
+    UCHAR FAR * szFkTableQualifier, SWORD cbFkTableQualifier,
+    UCHAR FAR * szFkTableOwner, SWORD cbFkTableOwner, UCHAR FAR * szFkTableName,
+    SWORD cbFkTableName);
+RETCODE SQL_API SQLMoreResults (HSTMT hstmt);
+RETCODE SQL_API SQLNativeSql (HDBC hdbc, UCHAR FAR * szSqlStrIn,
+    SDWORD cbSqlStrIn, UCHAR FAR * szSqlStr, SDWORD cbSqlStrMax,
+    SDWORD FAR * pcbSqlStr);
+RETCODE SQL_API SQLNumParams (HSTMT hstmt, SWORD FAR * pcpar);
+RETCODE SQL_API SQLParamOptions (HSTMT hstmt, UDWORD crow, UDWORD FAR * pirow);
+RETCODE SQL_API SQLPrimaryKeys (HSTMT hstmt, UCHAR FAR * szTableQualifier,
+    SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
+    UCHAR FAR * szTableName, SWORD cbTableName);
+RETCODE SQL_API SQLProcedureColumns (HSTMT hstmt, UCHAR FAR * szProcQualifier,
+    SWORD cbProcQualifier, UCHAR FAR * szProcOwner, SWORD cbProcOwner,
+    UCHAR FAR * szProcName, SWORD cbProcName, UCHAR FAR * szColumnName,
+    SWORD cbColumnName);
+RETCODE SQL_API SQLProcedures (HSTMT hstmt, UCHAR FAR * szProcQualifier,
+    SWORD cbProcQualifier, UCHAR FAR * szProcOwner, SWORD cbProcOwner,
+    UCHAR FAR * szProcName, SWORD cbProcName);
+RETCODE SQL_API SQLSetPos (HSTMT hstmt, UWORD irow, UWORD fOption, UWORD fLock);
+RETCODE SQL_API SQLTablePrivileges (HSTMT hstmt, UCHAR FAR * szTableQualifier,
+    SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
+    UCHAR FAR * szTableName, SWORD cbTableName);
+
+/*
+ *  SDK 2.0 Additional function prototypes
+ */
+RETCODE SQL_API SQLDrivers (HENV henv, UWORD fDirection,
+    UCHAR FAR * szDriverDesc, SWORD cbDriverDescMax, SWORD FAR * pcbDriverDesc,
+    UCHAR FAR * szDriverAttributes, SWORD cbDrvrAttrMax,
+    SWORD FAR * pcbDrvrAttr);
+RETCODE SQL_API SQLBindParameter (HSTMT hstmt, UWORD ipar, SWORD fParamType,
+    SWORD fCType, SWORD fSqlType, UDWORD cbColDef, SWORD ibScale, PTR rgbValue,
+    SDWORD cbValueMax, SDWORD FAR * pcbValue);
+
+/*
+ *  Depreciated - use SQLSetStmtOptions
+ */
+RETCODE SQL_API SQLSetScrollOptions (HSTMT hstmt, UWORD fConcurrency,
+    SDWORD crowKeyset, UWORD crowRowset);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/include/wx/unix/isql.h b/include/wx/unix/isql.h
deleted file mode 100644
index a1f406626d..0000000000
--- a/include/wx/unix/isql.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- *  isql.h
- *
- *  $Id$
- *
- *  iODBC defines
- *
- *  The iODBC driver manager.
- *  
- *  Copyright (C) 1995 by Ke Jin <kejin@empress.com> 
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#ifndef _ISQL_H
-#define _ISQL_H
-
-#ifdef WIN32
-#define SQL_API				__stdcall
-#else
-#define FAR
-#define EXPORT
-#define CALLBACK
-#define SQL_API				EXPORT CALLBACK
-
-typedef void *HWND;
-#endif
-
-typedef void *SQLHWND;
-
-typedef unsigned char UCHAR;
-typedef long int SDWORD;
-typedef short int SWORD;
-typedef unsigned long int UDWORD;
-typedef unsigned short int UWORD;
-
-typedef void FAR *PTR;
-typedef void FAR *HENV;
-typedef void FAR *HDBC;
-typedef void FAR *HSTMT;
-
-typedef signed short RETCODE;
-#define SQLRETURN	RETCODE
-
-
-#define ODBCVER				0x0250
-
-#define SQL_MAX_MESSAGE_LENGTH		512
-#define SQL_MAX_DSN_LENGTH		32
-
-/*
- *  Function return codes
- */
-#define SQL_INVALID_HANDLE		(-2)
-#define SQL_ERROR			(-1)
-#define SQL_SUCCESS 			0
-#define SQL_SUCCESS_WITH_INFO		1
-#define SQL_NO_DATA_FOUND		100
-
-/*
- *  Standard SQL datatypes, using ANSI type numbering
- */
-#define SQL_CHAR			1
-#define SQL_NUMERIC 			2
-#define SQL_DECIMAL 			3
-#define SQL_INTEGER 			4
-#define SQL_SMALLINT			5
-#define SQL_FLOAT			6
-#define SQL_REAL			7
-#define SQL_DOUBLE			8
-#define SQL_VARCHAR 			12
-
-#define SQL_TYPE_MIN			SQL_CHAR
-#define SQL_TYPE_NULL			0
-#define SQL_TYPE_MAX			SQL_VARCHAR
-
-/*
- *  C datatype to SQL datatype mapping
- */
-#define SQL_C_CHAR			SQL_CHAR
-#define SQL_C_LONG			SQL_INTEGER
-#define SQL_C_SHORT			SQL_SMALLINT
-#define SQL_C_FLOAT			SQL_REAL
-#define SQL_C_DOUBLE			SQL_DOUBLE
-#define SQL_C_DEFAULT 			99
-
-/*
- *  NULL status constants.
- */
-#define SQL_NO_NULLS			0
-#define SQL_NULLABLE			1
-#define SQL_NULLABLE_UNKNOWN		2
-
-/*
- *  Special length values
- */
-#define SQL_NULL_DATA			(-1)
-#define SQL_DATA_AT_EXEC		(-2)
-#define SQL_NTS 			(-3)
-
-/*
- *  SQLFreeStmt
- */
-#define SQL_CLOSE			0
-#define SQL_DROP			1
-#define SQL_UNBIND			2
-#define SQL_RESET_PARAMS		3
-
-/*
- *  SQLTransact
- */
-#define SQL_COMMIT			0
-#define SQL_ROLLBACK			1
-
-/*
- *  SQLColAttributes
- */
-#define SQL_COLUMN_COUNT		0
-#define SQL_COLUMN_NAME			1
-#define SQL_COLUMN_TYPE			2
-#define SQL_COLUMN_LENGTH		3
-#define SQL_COLUMN_PRECISION		4
-#define SQL_COLUMN_SCALE		5
-#define SQL_COLUMN_DISPLAY_SIZE		6
-#define SQL_COLUMN_NULLABLE		7
-#define SQL_COLUMN_UNSIGNED		8
-#define SQL_COLUMN_MONEY		9
-#define SQL_COLUMN_UPDATABLE		10
-#define SQL_COLUMN_AUTO_INCREMENT	11
-#define SQL_COLUMN_CASE_SENSITIVE	12
-#define SQL_COLUMN_SEARCHABLE		13
-#define SQL_COLUMN_TYPE_NAME		14
-#define SQL_COLUMN_TABLE_NAME		15
-#define SQL_COLUMN_OWNER_NAME		16
-#define SQL_COLUMN_QUALIFIER_NAME	17
-#define SQL_COLUMN_LABEL		18
-
-#define SQL_COLATT_OPT_MAX		SQL_COLUMN_LABEL
-#define	SQL_COLATT_OPT_MIN		SQL_COLUMN_COUNT
-#define SQL_COLUMN_DRIVER_START		1000
-
-/*
- *  SQLColAttributes : SQL_COLUMN_UPDATABLE
- */
-#define SQL_ATTR_READONLY		0
-#define SQL_ATTR_WRITE			1
-#define SQL_ATTR_READWRITE_UNKNOWN	2
-
-/*
- *  SQLColAttributes : SQL_COLUMN_SEARCHABLE
- */
-#define SQL_UNSEARCHABLE		0
-#define SQL_LIKE_ONLY			1
-#define SQL_ALL_EXCEPT_LIKE 		2
-#define SQL_SEARCHABLE			3
-
-/*
- *  NULL Handles
- */
-#define SQL_NULL_HENV			0
-#define SQL_NULL_HDBC			0
-#define SQL_NULL_HSTMT			0
-
-
-/*
- *  Function Prototypes
- */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-  RETCODE SQL_API SQLAllocConnect (HENV henv, HDBC FAR * phdbc);
-  RETCODE SQL_API SQLAllocEnv (HENV FAR * phenv);
-  RETCODE SQL_API SQLAllocStmt (HDBC hdbc, HSTMT FAR * phstmt);
-  RETCODE SQL_API SQLBindCol (HSTMT hstmt, UWORD icol, SWORD fCType,
-      PTR rgbValue, SDWORD cbValueMax, SDWORD FAR * pcbValue);
-  RETCODE SQL_API SQLCancel (HSTMT hstmt);
-  RETCODE SQL_API SQLColAttributes (HSTMT hstmt, UWORD icol, UWORD fDescType,
-      PTR rgbDesc, SWORD cbDescMax, SWORD FAR * pcbDesc, SDWORD FAR * pfDesc);
-  RETCODE SQL_API SQLConnect (HDBC hdbc, UCHAR FAR * szDSN, SWORD cbDSN,
-      UCHAR FAR * szUID, SWORD cbUID, UCHAR FAR * szAuthStr, SWORD cbAuthStr);
-  RETCODE SQL_API SQLDescribeCol (HSTMT hstmt, UWORD icol,
-      UCHAR FAR * szColName, SWORD cbColNameMax, SWORD FAR * pcbColName,
-      SWORD FAR * pfSqlType, UDWORD FAR * pcbColDef, SWORD FAR * pibScale,
-      SWORD FAR * pfNullable);
-  RETCODE SQL_API SQLDisconnect (HDBC hdbc);
-  RETCODE SQL_API SQLError (HENV henv, HDBC hdbc, HSTMT hstmt,
-      UCHAR FAR * szSqlState, SDWORD FAR * pfNativeError, UCHAR FAR * szErrorMsg,
-      SWORD cbErrorMsgMax, SWORD FAR * pcbErrorMsg);
-  RETCODE SQL_API SQLExecDirect (HSTMT hstmt, UCHAR FAR * szSqlStr,
-      SDWORD cbSqlStr);
-  RETCODE SQL_API SQLExecute (HSTMT hstmt);
-  RETCODE SQL_API SQLFetch (HSTMT hstmt);
-  RETCODE SQL_API SQLFreeConnect (HDBC hdbc);
-  RETCODE SQL_API SQLFreeEnv (HENV henv);
-  RETCODE SQL_API SQLFreeStmt (HSTMT hstmt, UWORD fOption);
-  RETCODE SQL_API SQLGetCursorName (HSTMT hstmt, UCHAR FAR * szCursor,
-      SWORD cbCursorMax, SWORD FAR * pcbCursor);
-  RETCODE SQL_API SQLNumResultCols (HSTMT hstmt, SWORD FAR * pccol);
-  RETCODE SQL_API SQLPrepare (HSTMT hstmt, UCHAR FAR * szSqlStr,
-      SDWORD cbSqlStr);
-  RETCODE SQL_API SQLRowCount (HSTMT hstmt, SDWORD FAR * pcrow);
-  RETCODE SQL_API SQLSetCursorName (HSTMT hstmt, UCHAR FAR * szCursor,
-      SWORD cbCursor);
-  RETCODE SQL_API SQLTransact (HENV henv, HDBC hdbc, UWORD fType);
-
-/*
- *  Depreciated ODBC 1.0 function - Use SQLBindParameter
- */
-  RETCODE SQL_API SQLSetParam (HSTMT hstmt, UWORD ipar, SWORD fCType,
-      SWORD fSqlType, UDWORD cbColDef, SWORD ibScale, PTR rgbValue,
-      SDWORD FAR * pcbValue);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/wx/unix/isqlext.h b/include/wx/unix/isqlext.h
deleted file mode 100644
index 414c300172..0000000000
--- a/include/wx/unix/isqlext.h
+++ /dev/null
@@ -1,1177 +0,0 @@
-/*
- *
- *  isqlext.h
- *
- *  $Id$
- *
- *  iODBC defines (ext)
- *
- *  The iODBC driver manager.
- *  
- *  Copyright (C) 1995 by Ke Jin <kejin@empress.com> 
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#ifndef	_ISQLEXT_H
-# define _ISQLEXT_H
-
-#include "isql.h"
-
-/*
- *  Generic constants
- */
-#define SQL_MAX_OPTION_STRING_LENGTH	256
-
-/*
- *  Additional return codes
- */
-#define SQL_STILL_EXECUTING 		2
-#define SQL_NEED_DATA			99
-
-/*
- *  SQL extended datatypes
- */
-#define SQL_DATE			9
-#define SQL_TIME			10
-#define SQL_TIMESTAMP			11
-#define SQL_LONGVARCHAR		 	(-1)
-#define SQL_BINARY			(-2)
-#define SQL_VARBINARY			(-3)
-#define SQL_LONGVARBINARY		(-4)
-#define SQL_BIGINT			(-5)
-#define SQL_TINYINT 			(-6)
-#define SQL_BIT 			(-7)
-
-#define SQL_INTERVAL_YEAR		(-80)
-#define SQL_INTERVAL_MONTH		(-81)
-#define SQL_INTERVAL_YEAR_TO_MONTH	(-82)
-#define SQL_INTERVAL_DAY		(-83)
-#define SQL_INTERVAL_HOUR		(-84)
-#define SQL_INTERVAL_MINUTE		(-85)
-#define SQL_INTERVAL_SECOND		(-86)
-#define SQL_INTERVAL_DAY_TO_HOUR	(-87)
-#define SQL_INTERVAL_DAY_TO_MINUTE	(-88)
-#define SQL_INTERVAL_DAY_TO_SECOND	(-89)
-#define SQL_INTERVAL_HOUR_TO_MINUTE	(-90)
-#define SQL_INTERVAL_HOUR_TO_SECOND	(-91)
-#define SQL_INTERVAL_MINUTE_TO_SECOND	(-92)
-#define SQL_UNICODE			(-95)
-
-#define SQL_TYPE_DRIVER_START		SQL_INTERVAL_YEAR
-#define SQL_TYPE_DRIVER_END		SQL_UNICODE
-
-#define SQL_SIGNED_OFFSET		(-20)
-#define SQL_UNSIGNED_OFFSET		(-22)
-
-/*
- *  C datatype to SQL datatype mapping
- */
-#define SQL_C_DATE			SQL_DATE
-#define SQL_C_TIME			SQL_TIME
-#define SQL_C_TIMESTAMP 		SQL_TIMESTAMP
-#define SQL_C_BINARY			SQL_BINARY
-#define SQL_C_BIT			SQL_BIT
-#define SQL_C_TINYINT			SQL_TINYINT
-#define SQL_C_SLONG 			SQL_C_LONG+SQL_SIGNED_OFFSET
-#define SQL_C_SSHORT			SQL_C_SHORT+SQL_SIGNED_OFFSET
-#define SQL_C_STINYINT			SQL_TINYINT+SQL_SIGNED_OFFSET
-#define SQL_C_ULONG 			SQL_C_LONG+SQL_UNSIGNED_OFFSET
-#define SQL_C_USHORT			SQL_C_SHORT+SQL_UNSIGNED_OFFSET
-#define SQL_C_UTINYINT			SQL_TINYINT+SQL_UNSIGNED_OFFSET
-#define SQL_C_BOOKMARK			SQL_C_ULONG
-
-/*
- *  Extended data types override sql.h defined
- */
-#undef	SQL_TYPE_MIN
-#define SQL_TYPE_MIN		SQL_BIT
-#define SQL_ALL_TYPES		0
-
-/*
- *  SQL portable types for C - DATE, TIME, TIMESTAMP
- */
-typedef struct _DATE_STRUCT
-  {
-    SWORD year;
-    UWORD month;
-    UWORD day;
-  }
-DATE_STRUCT;
-
-typedef struct _TIME_STRUCT
-  {
-    UWORD hour;
-    UWORD minute;
-    UWORD second;
-  }
-TIME_STRUCT;
-
-typedef struct _TIMESTAMP_STRUCT
-  {
-    SWORD year;
-    UWORD month;
-    UWORD day;
-    UWORD hour;
-    UWORD minute;
-    UWORD second;
-    UDWORD fraction;
-  }
-TIMESTAMP_STRUCT;
-
-typedef unsigned long int	BOOKMARK;
-
-/*
- * ----------------------------------------------------------------------
- *  Level 1 Functions
- * ----------------------------------------------------------------------
- */
-
-/*
- *  SQLDriverConnect
- */
-#define SQL_DRIVER_NOPROMPT 		0
-#define SQL_DRIVER_COMPLETE 		1
-#define SQL_DRIVER_PROMPT		2
-#define SQL_DRIVER_COMPLETE_REQUIRED	3
-
-/*
- *  SQLGetData
- */
-#define SQL_NO_TOTAL			(-4)
-
-/*
- *  SQLBindParameter
- */
-#define SQL_DEFAULT_PARAM		(-5)
-#define SQL_IGNORE			(-6)
-#define SQL_LEN_DATA_AT_EXEC_OFFSET	(-100)
-#define SQL_LEN_DATA_AT_EXEC(length) 	(-length+SQL_LEN_DATA_AT_EXEC_OFFSET)
-
-/*
- *  SQLGetFunctions
- */
-#define SQL_API_SQLALLOCCONNECT		1	/* Core Functions */
-#define SQL_API_SQLALLOCENV		2
-#define SQL_API_SQLALLOCSTMT		3
-#define SQL_API_SQLBINDCOL		4
-#define SQL_API_SQLCANCEL		5
-#define SQL_API_SQLCOLATTRIBUTES	6
-#define SQL_API_SQLCONNECT		7
-#define SQL_API_SQLDESCRIBECOL		8
-#define SQL_API_SQLDISCONNECT		9
-#define SQL_API_SQLERROR		10
-#define SQL_API_SQLEXECDIRECT		11
-#define SQL_API_SQLEXECUTE		12
-#define SQL_API_SQLFETCH		13
-#define SQL_API_SQLFREECONNECT		14
-#define SQL_API_SQLFREEENV		15
-#define SQL_API_SQLFREESTMT		16
-#define SQL_API_SQLGETCURSORNAME	17
-#define SQL_API_SQLNUMRESULTCOLS	18
-#define SQL_API_SQLPREPARE		19
-#define SQL_API_SQLROWCOUNT		20
-#define SQL_API_SQLSETCURSORNAME	21
-#define SQL_API_SQLSETPARAM		22
-#define SQL_API_SQLTRANSACT		23
-
-#define SQL_NUM_FUNCTIONS		23
-
-#define SQL_EXT_API_START		40
-
-#define SQL_API_SQLCOLUMNS		40	/* Level 1 Functions */
-#define SQL_API_SQLDRIVERCONNECT	41
-#define SQL_API_SQLGETCONNECTOPTION 	42
-#define SQL_API_SQLGETDATA		43
-#define SQL_API_SQLGETFUNCTIONS		44
-#define SQL_API_SQLGETINFO		45
-#define SQL_API_SQLGETSTMTOPTION	46
-#define SQL_API_SQLGETTYPEINFO		47
-#define SQL_API_SQLPARAMDATA		48
-#define SQL_API_SQLPUTDATA		49
-#define SQL_API_SQLSETCONNECTOPTION 	50
-#define SQL_API_SQLSETSTMTOPTION	51
-#define SQL_API_SQLSPECIALCOLUMNS	52
-#define SQL_API_SQLSTATISTICS		53
-#define SQL_API_SQLTABLES		54
-
-#define SQL_API_SQLBROWSECONNECT	55	/* Level 2 Functions */
-#define SQL_API_SQLCOLUMNPRIVILEGES 	56
-#define SQL_API_SQLDATASOURCES		57
-#define SQL_API_SQLDESCRIBEPARAM	58
-#define SQL_API_SQLEXTENDEDFETCH	59
-#define SQL_API_SQLFOREIGNKEYS		60
-#define SQL_API_SQLMORERESULTS		61
-#define SQL_API_SQLNATIVESQL		62
-#define SQL_API_SQLNUMPARAMS		63
-#define SQL_API_SQLPARAMOPTIONS		64
-#define SQL_API_SQLPRIMARYKEYS		65
-#define SQL_API_SQLPROCEDURECOLUMNS 	66
-#define SQL_API_SQLPROCEDURES		67
-#define SQL_API_SQLSETPOS		68
-#define SQL_API_SQLSETSCROLLOPTIONS 	69
-#define SQL_API_SQLTABLEPRIVILEGES	70
-
-#define SQL_API_SQLDRIVERS		71
-#define SQL_API_SQLBINDPARAMETER	72
-#define SQL_EXT_API_LAST		SQL_API_SQLBINDPARAMETER
-
-#define SQL_API_ALL_FUNCTIONS		0
-
-#define SQL_NUM_EXTENSIONS (SQL_EXT_API_LAST-SQL_EXT_API_START+1)
-
-/*
- *  SQLGetInfo
- */
-#define SQL_INFO_FIRST			0
-#define SQL_ACTIVE_CONNECTIONS		0
-#define SQL_ACTIVE_STATEMENTS		1
-#define SQL_DATA_SOURCE_NAME		2
-#define SQL_DRIVER_HDBC			3
-#define SQL_DRIVER_HENV			4
-#define SQL_DRIVER_HSTMT		5
-#define SQL_DRIVER_NAME			6
-#define SQL_DRIVER_VER			7
-#define SQL_FETCH_DIRECTION		8
-#define SQL_ODBC_API_CONFORMANCE	9
-#define SQL_ODBC_VER			10
-#define SQL_ROW_UPDATES			11
-#define SQL_ODBC_SAG_CLI_CONFORMANCE	12
-#define SQL_SERVER_NAME			13
-#define SQL_SEARCH_PATTERN_ESCAPE	14
-#define SQL_ODBC_SQL_CONFORMANCE	15
-#define SQL_DBMS_NAME			17
-#define SQL_DBMS_VER			18
-#define SQL_ACCESSIBLE_TABLES		19
-#define SQL_ACCESSIBLE_PROCEDURES	20
-#define SQL_PROCEDURES			21
-#define SQL_CONCAT_NULL_BEHAVIOR	22
-#define SQL_CURSOR_COMMIT_BEHAVIOR	23
-#define SQL_CURSOR_ROLLBACK_BEHAVIOR	24
-#define SQL_DATA_SOURCE_READ_ONLY	25
-#define SQL_DEFAULT_TXN_ISOLATION	26
-#define SQL_EXPRESSIONS_IN_ORDERBY	27
-#define SQL_IDENTIFIER_CASE		28
-#define SQL_IDENTIFIER_QUOTE_CHAR	29
-#define SQL_MAX_COLUMN_NAME_LEN		30
-#define SQL_MAX_CURSOR_NAME_LEN		31
-#define SQL_MAX_OWNER_NAME_LEN		32
-#define SQL_MAX_PROCEDURE_NAME_LEN	33
-#define SQL_MAX_QUALIFIER_NAME_LEN	34
-#define SQL_MAX_TABLE_NAME_LEN		35
-#define SQL_MULT_RESULT_SETS		36
-#define SQL_MULTIPLE_ACTIVE_TXN		37
-#define SQL_OUTER_JOINS			38
-#define SQL_OWNER_TERM			39
-#define SQL_PROCEDURE_TERM		40
-#define SQL_QUALIFIER_NAME_SEPARATOR	41
-#define SQL_QUALIFIER_TERM		42
-#define SQL_SCROLL_CONCURRENCY		43
-#define SQL_SCROLL_OPTIONS		44
-#define SQL_TABLE_TERM			45
-#define SQL_TXN_CAPABLE			46
-#define SQL_USER_NAME			47
-#define SQL_CONVERT_FUNCTIONS		48
-#define SQL_NUMERIC_FUNCTIONS		49
-#define SQL_STRING_FUNCTIONS		50
-#define SQL_SYSTEM_FUNCTIONS		51
-#define SQL_TIMEDATE_FUNCTIONS		52
-#define SQL_CONVERT_BIGINT		53
-#define SQL_CONVERT_BINARY		54
-#define SQL_CONVERT_BIT			55
-#define SQL_CONVERT_CHAR		56
-#define SQL_CONVERT_DATE		57
-#define SQL_CONVERT_DECIMAL		58
-#define SQL_CONVERT_DOUBLE		59
-#define SQL_CONVERT_FLOAT		60
-#define SQL_CONVERT_INTEGER		61
-#define SQL_CONVERT_LONGVARCHAR		62
-#define SQL_CONVERT_NUMERIC		63
-#define SQL_CONVERT_REAL		64
-#define SQL_CONVERT_SMALLINT		65
-#define SQL_CONVERT_TIME		66
-#define SQL_CONVERT_TIMESTAMP		67
-#define SQL_CONVERT_TINYINT		68
-#define SQL_CONVERT_VARBINARY		69
-#define SQL_CONVERT_VARCHAR		70
-#define SQL_CONVERT_LONGVARBINARY	71
-#define SQL_TXN_ISOLATION_OPTION	72
-#define SQL_ODBC_SQL_OPT_IEF		73
-
-/*
- *  ODBC SDK 1.0 Additions
- */
-#define SQL_CORRELATION_NAME		74
-#define SQL_NON_NULLABLE_COLUMNS	75
-
-/*
- *  ODBC SDK 2.0 Additions
- */
-#define SQL_DRIVER_HLIB 		76
-#define SQL_DRIVER_ODBC_VER 		77
-#define SQL_LOCK_TYPES			78
-#define SQL_POS_OPERATIONS		79
-#define SQL_POSITIONED_STATEMENTS	80
-#define SQL_GETDATA_EXTENSIONS		81
-#define SQL_BOOKMARK_PERSISTENCE	82
-#define SQL_STATIC_SENSITIVITY		83
-#define SQL_FILE_USAGE			84
-#define SQL_NULL_COLLATION		85
-#define SQL_ALTER_TABLE 		86
-#define SQL_COLUMN_ALIAS		87
-#define SQL_GROUP_BY			88
-#define SQL_KEYWORDS			89
-#define SQL_ORDER_BY_COLUMNS_IN_SELECT	90
-#define SQL_OWNER_USAGE 		91
-#define SQL_QUALIFIER_USAGE 		92
-#define SQL_QUOTED_IDENTIFIER_CASE	93
-#define SQL_SPECIAL_CHARACTERS		94
-#define SQL_SUBQUERIES			95
-#define SQL_UNION			96
-#define SQL_MAX_COLUMNS_IN_GROUP_BY 	97
-#define SQL_MAX_COLUMNS_IN_INDEX	98
-#define SQL_MAX_COLUMNS_IN_ORDER_BY 	99
-#define SQL_MAX_COLUMNS_IN_SELECT	100
-#define SQL_MAX_COLUMNS_IN_TABLE	101
-#define SQL_MAX_INDEX_SIZE		102
-#define SQL_MAX_ROW_SIZE_INCLUDES_LONG	103
-#define SQL_MAX_ROW_SIZE		104
-#define SQL_MAX_STATEMENT_LEN		105
-#define SQL_MAX_TABLES_IN_SELECT	106
-#define SQL_MAX_USER_NAME_LEN		107
-#define SQL_MAX_CHAR_LITERAL_LEN 	108
-#define SQL_TIMEDATE_ADD_INTERVALS	109
-#define SQL_TIMEDATE_DIFF_INTERVALS 	110
-#define SQL_NEED_LONG_DATA_LEN		111
-#define SQL_MAX_BINARY_LITERAL_LEN	112
-#define SQL_LIKE_ESCAPE_CLAUSE		113
-#define SQL_QUALIFIER_LOCATION		114
-
-/*
- *  ODBC SDK 2.01 Additions
- */
-#define SQL_OJ_CAPABILITIES 		65003	/* Temp value until ODBC 3.0 */
-
-#define SQL_INFO_LAST			SQL_QUALIFIER_LOCATION
-#define SQL_INFO_DRIVER_START		1000
-
-
-/*
- *  SQL_CONVERT_* bitmask values
- */
-#define SQL_CVT_CHAR			0x00000001L
-#define SQL_CVT_NUMERIC 		0x00000002L
-#define SQL_CVT_DECIMAL 		0x00000004L
-#define SQL_CVT_INTEGER 		0x00000008L
-#define SQL_CVT_SMALLINT		0x00000010L
-#define SQL_CVT_FLOAT			0x00000020L
-#define SQL_CVT_REAL			0x00000040L
-#define SQL_CVT_DOUBLE			0x00000080L
-#define SQL_CVT_VARCHAR 		0x00000100L
-#define SQL_CVT_LONGVARCHAR 		0x00000200L
-#define SQL_CVT_BINARY			0x00000400L
-#define SQL_CVT_VARBINARY		0x00000800L
-#define SQL_CVT_BIT 			0x00001000L
-#define SQL_CVT_TINYINT 		0x00002000L
-#define SQL_CVT_BIGINT			0x00004000L
-#define SQL_CVT_DATE			0x00008000L
-#define SQL_CVT_TIME			0x00010000L
-#define SQL_CVT_TIMESTAMP		0x00020000L
-#define SQL_CVT_LONGVARBINARY		0x00040000L
-
-/*
- *  SQL_CONVERT_FUNCTIONS
- */
-#define SQL_FN_CVT_CONVERT		0x00000001L
-
-/*
- *  SQL_STRING_FUNCTIONS
- */
-#define SQL_FN_STR_CONCAT		0x00000001L
-#define SQL_FN_STR_INSERT		0x00000002L
-#define SQL_FN_STR_LEFT 		0x00000004L
-#define SQL_FN_STR_LTRIM		0x00000008L
-#define SQL_FN_STR_LENGTH		0x00000010L
-#define SQL_FN_STR_LOCATE		0x00000020L
-#define SQL_FN_STR_LCASE		0x00000040L
-#define SQL_FN_STR_REPEAT		0x00000080L
-#define SQL_FN_STR_REPLACE		0x00000100L
-#define SQL_FN_STR_RIGHT		0x00000200L
-#define SQL_FN_STR_RTRIM		0x00000400L
-#define SQL_FN_STR_SUBSTRING		0x00000800L
-#define SQL_FN_STR_UCASE		0x00001000L
-#define SQL_FN_STR_ASCII		0x00002000L
-#define SQL_FN_STR_CHAR 		0x00004000L
-#define SQL_FN_STR_DIFFERENCE		0x00008000L
-#define SQL_FN_STR_LOCATE_2 		0x00010000L
-#define SQL_FN_STR_SOUNDEX		0x00020000L
-#define SQL_FN_STR_SPACE		0x00040000L
-
-/*
- *  SQL_NUMERIC_FUNCTIONS
- */
-#define SQL_FN_NUM_ABS			0x00000001L
-#define SQL_FN_NUM_ACOS 		0x00000002L
-#define SQL_FN_NUM_ASIN 		0x00000004L
-#define SQL_FN_NUM_ATAN 		0x00000008L
-#define SQL_FN_NUM_ATAN2		0x00000010L
-#define SQL_FN_NUM_CEILING		0x00000020L
-#define SQL_FN_NUM_COS			0x00000040L
-#define SQL_FN_NUM_COT			0x00000080L
-#define SQL_FN_NUM_EXP			0x00000100L
-#define SQL_FN_NUM_FLOOR		0x00000200L
-#define SQL_FN_NUM_LOG			0x00000400L
-#define SQL_FN_NUM_MOD			0x00000800L
-#define SQL_FN_NUM_SIGN		 	0x00001000L
-#define SQL_FN_NUM_SIN			0x00002000L
-#define SQL_FN_NUM_SQRT		 	0x00004000L
-#define SQL_FN_NUM_TAN			0x00008000L
-#define SQL_FN_NUM_PI			0x00010000L
-#define SQL_FN_NUM_RAND		 	0x00020000L
-#define SQL_FN_NUM_DEGREES		0x00040000L
-#define SQL_FN_NUM_LOG10		0x00080000L
-#define SQL_FN_NUM_POWER		0x00100000L
-#define SQL_FN_NUM_RADIANS		0x00200000L
-#define SQL_FN_NUM_ROUND		0x00400000L
-#define SQL_FN_NUM_TRUNCATE 		0x00800000L
-
-/*
- *  SQL_TIMEDATE_FUNCTIONS
- */
-#define SQL_FN_TD_NOW			0x00000001L
-#define SQL_FN_TD_CURDATE		0x00000002L
-#define SQL_FN_TD_DAYOFMONTH		0x00000004L
-#define SQL_FN_TD_DAYOFWEEK 		0x00000008L
-#define SQL_FN_TD_DAYOFYEAR 		0x00000010L
-#define SQL_FN_TD_MONTH 		0x00000020L
-#define SQL_FN_TD_QUARTER		0x00000040L
-#define SQL_FN_TD_WEEK			0x00000080L
-#define SQL_FN_TD_YEAR			0x00000100L
-#define SQL_FN_TD_CURTIME		0x00000200L
-#define SQL_FN_TD_HOUR			0x00000400L
-#define SQL_FN_TD_MINUTE		0x00000800L
-#define SQL_FN_TD_SECOND		0x00001000L
-#define SQL_FN_TD_TIMESTAMPADD		0x00002000L
-#define SQL_FN_TD_TIMESTAMPDIFF 	0x00004000L
-#define SQL_FN_TD_DAYNAME		0x00008000L
-#define SQL_FN_TD_MONTHNAME 		0x00010000L
-
-/*
- *  SQL_SYSTEM_FUNCTIONS
- */
-#define SQL_FN_SYS_USERNAME 		0x00000001L
-#define SQL_FN_SYS_DBNAME		0x00000002L
-#define SQL_FN_SYS_IFNULL		0x00000004L
-
-/*
- *  SQL_TIMEDATE_ADD_INTERVALS
- *  SQL_TIMEDATE_DIFF_INTERVALS
- */
-#define SQL_FN_TSI_FRAC_SECOND		0x00000001L
-#define SQL_FN_TSI_SECOND		0x00000002L
-#define SQL_FN_TSI_MINUTE		0x00000004L
-#define SQL_FN_TSI_HOUR 		0x00000008L
-#define SQL_FN_TSI_DAY			0x00000010L
-#define SQL_FN_TSI_WEEK 		0x00000020L
-#define SQL_FN_TSI_MONTH		0x00000040L
-#define SQL_FN_TSI_QUARTER		0x00000080L
-#define SQL_FN_TSI_YEAR 		0x00000100L
-
-/*
- *  SQL_ODBC_API_CONFORMANCE
- */
-#define SQL_OAC_NONE			0x0000
-#define SQL_OAC_LEVEL1			0x0001
-#define SQL_OAC_LEVEL2			0x0002
-
-/*
- * SQL_ODBC_SAG_CLI_CONFORMANCE
- */
-#define SQL_OSCC_NOT_COMPLIANT		0x0000
-#define SQL_OSCC_COMPLIANT		0x0001
-
-/*
- *  SQL_ODBC_SQL_CONFORMANCE
- */
-#define SQL_OSC_MINIMUM 		0x0000
-#define SQL_OSC_CORE			0x0001
-#define SQL_OSC_EXTENDED		0x0002
-
-/*
- *  SQL_CONCAT_NULL_BEHAVIOR
- */
-#define SQL_CB_NULL 			0x0000
-#define SQL_CB_NON_NULL		 	0x0001
-
-/*
- *  SQL_CURSOR_COMMIT_BEHAVIOR
- *  SQL_CURSOR_ROLLBACK_BEHAVIOR
- */
-#define SQL_CB_DELETE			0x0000
-#define SQL_CB_CLOSE			0x0001
-#define SQL_CB_PRESERVE			0x0002
-
-/*
- *  SQL_IDENTIFIER_CASE
- */
-#define SQL_IC_UPPER			0x0001
-#define SQL_IC_LOWER			0x0002
-#define SQL_IC_SENSITIVE		0x0003
-#define SQL_IC_MIXED			0x0004
-
-/*
- *  SQL_TXN_CAPABLE
- */
-#define SQL_TC_NONE 			0x0000
-#define SQL_TC_DML			0x0001
-#define SQL_TC_ALL			0x0002
-#define SQL_TC_DDL_COMMIT		0x0003
-#define SQL_TC_DDL_IGNORE		0x0004
-
-/*
- *  SQL_SCROLL_OPTIONS
- */
-#define SQL_SO_FORWARD_ONLY 		0x00000001L
-#define SQL_SO_KEYSET_DRIVEN		0x00000002L
-#define SQL_SO_DYNAMIC			0x00000004L
-#define SQL_SO_MIXED			0x00000008L
-#define SQL_SO_STATIC			0x00000010L
-
-/*
- * SQL_SCROLL_CONCURRENCY
- */
-#define SQL_SCCO_READ_ONLY		0x00000001L
-#define SQL_SCCO_LOCK			0x00000002L
-#define SQL_SCCO_OPT_ROWVER 		0x00000004L
-#define SQL_SCCO_OPT_VALUES 		0x00000008L
-
-/*
- *  SQL_FETCH_DIRECTION
- */
-#define SQL_FD_FETCH_NEXT		0x00000001L
-#define SQL_FD_FETCH_FIRST		0x00000002L
-#define SQL_FD_FETCH_LAST		0x00000004L
-#define SQL_FD_FETCH_PRIOR		0x00000008L
-#define SQL_FD_FETCH_ABSOLUTE		0x00000010L
-#define SQL_FD_FETCH_RELATIVE		0x00000020L
-#define SQL_FD_FETCH_RESUME 		0x00000040L
-#define SQL_FD_FETCH_BOOKMARK		0x00000080L
-
-/*
- *  SQL_TXN_ISOLATION_OPTION
- */
-#define SQL_TXN_READ_UNCOMMITTED	0x00000001L
-#define SQL_TXN_READ_COMMITTED		0x00000002L
-#define SQL_TXN_REPEATABLE_READ 	0x00000004L
-#define SQL_TXN_SERIALIZABLE		0x00000008L
-#define SQL_TXN_VERSIONING		0x00000010L
-
-/*
- *  SQL_CORRELATION_NAME
- */
-#define SQL_CN_NONE 			0x0000
-#define SQL_CN_DIFFERENT		0x0001
-#define SQL_CN_ANY			0x0002
-
-/*
- * SQL_NON_NULLABLE_COLUMNS
- */
-#define SQL_NNC_NULL			0x0000
-#define SQL_NNC_NON_NULL		0x0001
-
-/*
- *  SQL_NULL_COLLATION
- */
-#define SQL_NC_HIGH 			0x0000
-#define SQL_NC_LOW			0x0001
-#define SQL_NC_START			0x0002
-#define SQL_NC_END			0x0004
-
-/*
- * SQL_FILE_USAGE
- */
-#define SQL_FILE_NOT_SUPPORTED		0x0000
-#define SQL_FILE_TABLE			0x0001
-#define SQL_FILE_QUALIFIER		0x0002
-
-/*
- *  SQL_GETDATA_EXTENSIONS
- */
-#define SQL_GD_ANY_COLUMN		0x00000001L
-#define SQL_GD_ANY_ORDER		0x00000002L
-#define SQL_GD_BLOCK			0x00000004L
-#define SQL_GD_BOUND			0x00000008L
-
-/*
- * SQL_ALTER_TABLE
- */
-#define SQL_AT_ADD_COLUMN		0x00000001L
-#define SQL_AT_DROP_COLUMN		0x00000002L
-
-/*
- *  SQL_POSITIONED_STATEMENTS
- */
-#define SQL_PS_POSITIONED_DELETE	0x00000001L
-#define SQL_PS_POSITIONED_UPDATE	0x00000002L
-#define SQL_PS_SELECT_FOR_UPDATE	0x00000004L
-
-/*
- *  SQL_GROUP_BY
- */
-#define SQL_GB_NOT_SUPPORTED		0x0000
-#define SQL_GB_GROUP_BY_EQUALS_SELECT	0x0001
-#define SQL_GB_GROUP_BY_CONTAINS_SELECT	0x0002
-#define SQL_GB_NO_RELATION		0x0003
-
-/*
- *  SQL_OWNER_USAGE
- */
-#define SQL_OU_DML_STATEMENTS		0x00000001L
-#define SQL_OU_PROCEDURE_INVOCATION	0x00000002L
-#define SQL_OU_TABLE_DEFINITION 	0x00000004L
-#define SQL_OU_INDEX_DEFINITION 	0x00000008L
-#define SQL_OU_PRIVILEGE_DEFINITION	0x00000010L
-
-/*
- * SQL_QUALIFIER_USAGE
- */
-#define SQL_QU_DML_STATEMENTS		0x00000001L
-#define SQL_QU_PROCEDURE_INVOCATION 	0x00000002L
-#define SQL_QU_TABLE_DEFINITION 	0x00000004L
-#define SQL_QU_INDEX_DEFINITION 	0x00000008L
-#define SQL_QU_PRIVILEGE_DEFINITION 	0x00000010L
-
-/*
- *  SQL_SUBQUERIES
- */
-#define SQL_SQ_COMPARISON		0x00000001L
-#define SQL_SQ_EXISTS			0x00000002L
-#define SQL_SQ_IN			0x00000004L
-#define SQL_SQ_QUANTIFIED		0x00000008L
-#define SQL_SQ_CORRELATED_SUBQUERIES	0x00000010L
-
-/*
- *  SQL_UNION
- */
-#define SQL_U_UNION			0x00000001L
-#define SQL_U_UNION_ALL			0x00000002L
-
-/*
- *  SQL_BOOKMARK_PERSISTENCE
- */
-#define SQL_BP_CLOSE			0x00000001L
-#define SQL_BP_DELETE			0x00000002L
-#define SQL_BP_DROP 			0x00000004L
-#define SQL_BP_TRANSACTION		0x00000008L
-#define SQL_BP_UPDATE			0x00000010L
-#define SQL_BP_OTHER_HSTMT		0x00000020L
-#define SQL_BP_SCROLL			0x00000040L
-
-/*
- * SQL_STATIC_SENSITIVITY
- */
-#define SQL_SS_ADDITIONS		0x00000001L
-#define SQL_SS_DELETIONS		0x00000002L
-#define SQL_SS_UPDATES			0x00000004L
-
-/*
- *  SQL_LOCK_TYPES
- */
-#define SQL_LCK_NO_CHANGE		0x00000001L
-#define SQL_LCK_EXCLUSIVE		0x00000002L
-#define SQL_LCK_UNLOCK			0x00000004L
-
-/*
- *  SQL_POS_OPERATIONS
- */
-#define SQL_POS_POSITION		0x00000001L
-#define SQL_POS_REFRESH 		0x00000002L
-#define SQL_POS_UPDATE			0x00000004L
-#define SQL_POS_DELETE			0x00000008L
-#define SQL_POS_ADD			0x00000010L
-
-/*
- *  SQL_QUALIFIER_LOCATION
- */
-#define SQL_QL_START			0x0001L
-#define SQL_QL_END			0x0002L
-
-/*
- *  SQL_OJ_CAPABILITIES
- */
-#define SQL_OJ_LEFT			0x00000001L
-#define SQL_OJ_RIGHT			0x00000002L
-#define SQL_OJ_FULL			0x00000004L
-#define SQL_OJ_NESTED			0x00000008L
-#define SQL_OJ_NOT_ORDERED		0x00000010L
-#define SQL_OJ_INNER			0x00000020L
-#define SQL_OJ_ALL_COMPARISON_OPS	0x00000040L
-
-/*
- *  SQLGetStmtOption/SQLSetStmtOption
- */
-#define SQL_QUERY_TIMEOUT		0
-#define SQL_MAX_ROWS			1
-#define SQL_NOSCAN			2
-#define SQL_MAX_LENGTH			3
-#define SQL_ASYNC_ENABLE		4
-#define SQL_BIND_TYPE			5
-#define SQL_CURSOR_TYPE 		6
-#define SQL_CONCURRENCY 		7
-#define SQL_KEYSET_SIZE 		8
-#define SQL_ROWSET_SIZE 		9
-#define SQL_SIMULATE_CURSOR 		10
-#define SQL_RETRIEVE_DATA		11
-#define SQL_USE_BOOKMARKS		12
-#define SQL_GET_BOOKMARK		13
-#define SQL_ROW_NUMBER			14
-
-#define SQL_STMT_OPT_MIN		SQL_QUERY_TIMEOUT
-#define SQL_STMT_OPT_MAX		SQL_ROW_NUMBER
-
-
-/*
- * SQL_QUERY_TIMEOUT
- */
-#define SQL_QUERY_TIMEOUT_DEFAULT	0UL
-
-/*
- *  SQL_MAX_ROWS
- */
-#define SQL_MAX_ROWS_DEFAULT		0UL
-
-/*
- *  SQL_NOSCAN
- */
-#define SQL_NOSCAN_OFF			0UL	/* 1.0 FALSE */
-#define SQL_NOSCAN_ON			1UL	/* 1.0 TRUE */
-#define SQL_NOSCAN_DEFAULT		SQL_NOSCAN_OFF
-
-/*
- *  SQL_MAX_LENGTH
- */
-#define SQL_MAX_LENGTH_DEFAULT		0UL
-
-/*
- *  SQL_ASYNC_ENABLE
- */
-#define SQL_ASYNC_ENABLE_OFF		0UL
-#define SQL_ASYNC_ENABLE_ON		1UL
-#define SQL_ASYNC_ENABLE_DEFAULT	SQL_ASYNC_ENABLE_OFF
-
-/*
- *  SQL_BIND_TYPE
- */
-#define SQL_BIND_BY_COLUMN		0UL
-#define SQL_BIND_TYPE_DEFAULT		SQL_BIND_BY_COLUMN
-
-/*
- *  SQL_CONCURRENCY
- */
-#define SQL_CONCUR_READ_ONLY		1
-#define SQL_CONCUR_LOCK 		2
-#define SQL_CONCUR_ROWVER		3
-#define SQL_CONCUR_VALUES		4
-#define SQL_CONCUR_DEFAULT		SQL_CONCUR_READ_ONLY
-
-/*
- *  SQL_CURSOR_TYPE
- */
-#define SQL_CURSOR_FORWARD_ONLY 	0UL
-#define SQL_CURSOR_KEYSET_DRIVEN	1UL
-#define SQL_CURSOR_DYNAMIC		2UL
-#define SQL_CURSOR_STATIC		3UL
-#define SQL_CURSOR_TYPE_DEFAULT		SQL_CURSOR_FORWARD_ONLY
-
-/*
- *  SQL_ROWSET_SIZE
- */
-#define SQL_ROWSET_SIZE_DEFAULT 	1UL
-
-/*
- *  SQL_KEYSET_SIZE
- */
-#define SQL_KEYSET_SIZE_DEFAULT		0UL
-
-/*
- *  SQL_SIMULATE_CURSOR
- */
-#define SQL_SC_NON_UNIQUE		0UL
-#define SQL_SC_TRY_UNIQUE		1UL
-#define SQL_SC_UNIQUE			2UL
-
-/*
- *  SQL_RETRIEVE_DATA
- */
-#define SQL_RD_OFF			0UL
-#define SQL_RD_ON			1UL
-#define SQL_RD_DEFAULT			SQL_RD_ON
-
-/*
- *  SQL_USE_BOOKMARKS
- */
-#define SQL_UB_OFF			0UL
-#define SQL_UB_ON			1UL
-#define SQL_UB_DEFAULT			SQL_UB_OFF
-
-/*
- *  SQLSetConnectOption/SQLGetConnectOption
- */
-#define SQL_ACCESS_MODE		 	101
-#define SQL_AUTOCOMMIT			102
-#define SQL_LOGIN_TIMEOUT		103
-#define SQL_OPT_TRACE			104
-#define SQL_OPT_TRACEFILE		105
-#define SQL_TRANSLATE_DLL		106
-#define SQL_TRANSLATE_OPTION		107
-#define SQL_TXN_ISOLATION		108
-#define SQL_CURRENT_QUALIFIER		109
-#define SQL_ODBC_CURSORS		110
-#define SQL_QUIET_MODE			111
-#define SQL_PACKET_SIZE		 	112
-
-#define	SQL_CONN_OPT_MIN		SQL_ACCESS_MODE
-#define SQL_CONN_OPT_MAX		SQL_PACKET_SIZE
-#define SQL_CONNECT_OPT_DRVR_START	1000
-
-
-/*
- *  SQL_ACCESS_MODE
- */
-#define SQL_MODE_READ_WRITE 		0UL
-#define SQL_MODE_READ_ONLY		1UL
-#define SQL_MODE_DEFAULT		SQL_MODE_READ_WRITE
-
-/*
- *  SQL_AUTOCOMMIT
- */
-#define SQL_AUTOCOMMIT_OFF		0UL
-#define SQL_AUTOCOMMIT_ON		1UL
-#define SQL_AUTOCOMMIT_DEFAULT		SQL_AUTOCOMMIT_ON
-
-/*
- *  SQL_LOGIN_TIMEOUT
- */
-#define SQL_LOGIN_TIMEOUT_DEFAULT	15UL
-
-/*
- *  SQL_OPT_TRACE
- */
-#define SQL_OPT_TRACE_OFF		0UL
-#define SQL_OPT_TRACE_ON		1UL
-#define SQL_OPT_TRACE_DEFAULT		SQL_OPT_TRACE_OFF
-#define SQL_OPT_TRACE_FILE_DEFAULT	"odbc.log"
-
-/*
- *  SQL_ODBC_CURSORS
- */
-#define SQL_CUR_USE_IF_NEEDED		0UL
-#define SQL_CUR_USE_ODBC		1UL
-#define SQL_CUR_USE_DRIVER		2UL
-#define SQL_CUR_DEFAULT 		SQL_CUR_USE_DRIVER
-
-/*
- *  SQLSpecialColumns - Column types and scopes
- */
-#define SQL_BEST_ROWID			1
-#define SQL_ROWVER			2
-
-#define SQL_SCOPE_CURROW		0
-#define SQL_SCOPE_TRANSACTION		1
-#define SQL_SCOPE_SESSION		2
-
-/*
- *  SQLSetPos
- */
-#define SQL_ENTIRE_ROWSET		0
-
-/*
- *  SQLSetPos
- */
-#define SQL_POSITION			0
-#define SQL_REFRESH 			1
-#define SQL_UPDATE			2
-#define SQL_DELETE			3
-#define SQL_ADD				4
-
-/*
- *  SQLSetPos
- */
-#define SQL_LOCK_NO_CHANGE		0
-#define SQL_LOCK_EXCLUSIVE		1
-#define SQL_LOCK_UNLOCK 		2
-
-/*
- *  SQLSetPos
- */
-#define SQL_POSITION_TO(hstmt,irow) 	\
-    SQLSetPos(hstmt,irow,SQL_POSITION,SQL_LOCK_NO_CHANGE)
-#define SQL_LOCK_RECORD(hstmt,irow,fLock) \
-    SQLSetPos(hstmt,irow,SQL_POSITION,fLock)
-#define SQL_REFRESH_RECORD(hstmt,irow,fLock) \
-    SQLSetPos(hstmt,irow,SQL_REFRESH,fLock)
-#define SQL_UPDATE_RECORD(hstmt,irow) \
-    SQLSetPos(hstmt,irow,SQL_UPDATE,SQL_LOCK_NO_CHANGE)
-#define SQL_DELETE_RECORD(hstmt,irow) \
-    SQLSetPos(hstmt,irow,SQL_DELETE,SQL_LOCK_NO_CHANGE)
-#define SQL_ADD_RECORD(hstmt,irow) \
-    SQLSetPos(hstmt,irow,SQL_ADD,SQL_LOCK_NO_CHANGE)
-
-/*
- *  All the ODBC keywords
- */
-#define SQL_ODBC_KEYWORDS \
-"ABSOLUTE,ACTION,ADA,ADD,ALL,ALLOCATE,ALTER,AND,ANY,ARE,AS,"\
-"ASC,ASSERTION,AT,AUTHORIZATION,AVG,"\
-"BEGIN,BETWEEN,BIT,BIT_LENGTH,BOTH,BY,CASCADE,CASCADED,CASE,CAST,CATALOG,"\
-"CHAR,CHAR_LENGTH,CHARACTER,CHARACTER_LENGTH,CHECK,CLOSE,COALESCE,"\
-"COBOL,COLLATE,COLLATION,COLUMN,COMMIT,CONNECT,CONNECTION,CONSTRAINT,"\
-"CONSTRAINTS,CONTINUE,CONVERT,CORRESPONDING,COUNT,CREATE,CROSS,CURRENT,"\
-"CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,"\
-"DATE,DAY,DEALLOCATE,DEC,DECIMAL,DECLARE,DEFAULT,DEFERRABLE,"\
-"DEFERRED,DELETE,DESC,DESCRIBE,DESCRIPTOR,DIAGNOSTICS,DISCONNECT,"\
-"DISTINCT,DOMAIN,DOUBLE,DROP,"\
-"ELSE,END,END-EXEC,ESCAPE,EXCEPT,EXCEPTION,EXEC,EXECUTE,"\
-"EXISTS,EXTERNAL,EXTRACT,"\
-"FALSE,FETCH,FIRST,FLOAT,FOR,FOREIGN,FORTRAN,FOUND,FROM,FULL,"\
-"GET,GLOBAL,GO,GOTO,GRANT,GROUP,HAVING,HOUR,"\
-"IDENTITY,IMMEDIATE,IN,INCLUDE,INDEX,INDICATOR,INITIALLY,INNER,"\
-"INPUT,INSENSITIVE,INSERT,INTEGER,INTERSECT,INTERVAL,INTO,IS,ISOLATION,"\
-"JOIN,KEY,LANGUAGE,LAST,LEADING,LEFT,LEVEL,LIKE,LOCAL,LOWER,"\
-"MATCH,MAX,MIN,MINUTE,MODULE,MONTH,MUMPS,"\
-"NAMES,NATIONAL,NATURAL,NCHAR,NEXT,NO,NONE,NOT,NULL,NULLIF,NUMERIC,"\
-"OCTET_LENGTH,OF,ON,ONLY,OPEN,OPTION,OR,ORDER,OUTER,OUTPUT,OVERLAPS,"\
-"PAD,PARTIAL,PASCAL,PLI,POSITION,PRECISION,PREPARE,PRESERVE,"\
-"PRIMARY,PRIOR,PRIVILEGES,PROCEDURE,PUBLIC,"\
-"REFERENCES,RELATIVE,RESTRICT,REVOKE,RIGHT,ROLLBACK,ROWS,"\
-"SCHEMA,SCROLL,SECOND,SECTION,SELECT,SEQUENCE,SESSION,SESSION_USER,SET,SIZE,"\
-"SMALLINT,SOME,SPACE,SQL,SQLCA,SQLCODE,SQLERROR,SQLSTATE,SQLWARNING,"\
-"SUBSTRING,SUM,SYSTEM_USER,"\
-"TABLE,TEMPORARY,THEN,TIME,TIMESTAMP,TIMEZONE_HOUR,TIMEZONE_MINUTE,"\
-"TO,TRAILING,TRANSACTION,TRANSLATE,TRANSLATION,TRIM,TRUE,"\
-"UNION,UNIQUE,UNKNOWN,UPDATE,UPPER,USAGE,USER,USING,"\
-"VALUE,,VARCHAR,VARYING,VIEW,WHEN,WHENEVER,WHERE,WITH,WORK,YEAR"
-
-/*
- * ----------------------------------------------------------------------
- *  Level 2 Functions
- * ----------------------------------------------------------------------
- */
-
-/*
- *  SQLExtendedFetch - fFetchType
- */
-#define SQL_FETCH_NEXT			1
-#define SQL_FETCH_FIRST 		2
-#define SQL_FETCH_LAST			3
-#define SQL_FETCH_PRIOR			4
-#define SQL_FETCH_ABSOLUTE		5
-#define SQL_FETCH_RELATIVE		6
-#define SQL_FETCH_BOOKMARK		8
-
-/*
- *  SQLExtendedFetch - rgfRowStatus
- */
-#define SQL_ROW_SUCCESS 		0
-#define SQL_ROW_DELETED 		1
-#define SQL_ROW_UPDATED 		2
-#define SQL_ROW_NOROW			3
-#define SQL_ROW_ADDED			4
-#define SQL_ROW_ERROR			5
-
-/*
- *  SQLForeignKeys - UPDATE_RULE/DELETE_RULE
- */
-#define SQL_CASCADE 			0
-#define SQL_RESTRICT			1
-#define SQL_SET_NULL			2
-
-/*
- *  SQLBindParameter - fParamType
- *  SQLProcedureColumns - COLUMN_TYPE
- */
-#define SQL_PARAM_TYPE_UNKNOWN		0
-#define SQL_PARAM_INPUT			1
-#define SQL_PARAM_INPUT_OUTPUT		2
-#define SQL_RESULT_COL			3
-#define SQL_PARAM_OUTPUT		4
-#define SQL_RETURN_VALUE		5
-
-/*
- *  SQLSetParam to SQLBindParameter conversion
- */
-#define SQL_PARAM_TYPE_DEFAULT		SQL_PARAM_INPUT_OUTPUT
-#define SQL_SETPARAM_VALUE_MAX		(-1L)
-
-/*
- *  SQLStatistics - fUnique
- */
-#define SQL_INDEX_UNIQUE		0
-#define SQL_INDEX_ALL			1
-
-/*
- *  SQLStatistics - fAccuracy
- */
-#define SQL_QUICK			0
-#define SQL_ENSURE			1
-
-/*
- *  SQLStatistics - TYPE
- */
-#define SQL_TABLE_STAT			0
-#define SQL_INDEX_CLUSTERED 		1
-#define SQL_INDEX_HASHED		2
-#define SQL_INDEX_OTHER 		3
-
-/*
- *  SQLProcedures - PROCEDURE_TYPE
- */
-#define SQL_PT_UNKNOWN			0
-#define SQL_PT_PROCEDURE		1
-#define SQL_PT_FUNCTION 		2
-
-/*
- *  SQLSpecialColumns - PSEUDO_COLUMN
- */
-#define SQL_PC_UNKNOWN			0
-#define SQL_PC_NOT_PSEUDO		1
-#define SQL_PC_PSEUDO			2
-
-/*
- *  Deprecated defines from prior versions of ODBC
- */
-#define SQL_DATABASE_NAME 		16
-#define SQL_FD_FETCH_PREV		SQL_FD_FETCH_PRIOR
-#define SQL_FETCH_PREV			SQL_FETCH_PRIOR
-#define SQL_CONCUR_TIMESTAMP		SQL_CONCUR_ROWVER
-#define SQL_SCCO_OPT_TIMESTAMP		SQL_SCCO_OPT_ROWVER
-#define SQL_CC_DELETE			SQL_CB_DELETE
-#define SQL_CR_DELETE			SQL_CB_DELETE
-#define SQL_CC_CLOSE			SQL_CB_CLOSE
-#define SQL_CR_CLOSE			SQL_CB_CLOSE
-#define SQL_CC_PRESERVE 		SQL_CB_PRESERVE
-#define SQL_CR_PRESERVE 		SQL_CB_PRESERVE
-#define SQL_FETCH_RESUME		7
-#define SQL_SCROLL_FORWARD_ONLY 	0L
-#define SQL_SCROLL_KEYSET_DRIVEN	(-1L)
-#define SQL_SCROLL_DYNAMIC		(-2L)
-#define SQL_SCROLL_STATIC		(-3L)
-#define SQL_PC_NON_PSEUDO		SQL_PC_NOT_PSEUDO
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- *  Level 1 function prototypes
- */
-RETCODE SQL_API SQLColumns (HSTMT hstmt, UCHAR FAR * szTableQualifier,
-    SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
-    UCHAR FAR * szTableName, SWORD cbTableName, UCHAR FAR * szColumnName,
-    SWORD cbColumnName);
-RETCODE SQL_API SQLDriverConnect (HDBC hdbc, SQLHWND hwnd,  //glt
-    UCHAR FAR * szConnStrIn, SWORD cbConnStrIn, UCHAR FAR * szConnStrOut,
-    SWORD cbConnStrOutMax, SWORD FAR * pcbConnStrOut, UWORD fDriverCompletion);
-RETCODE SQL_API SQLGetConnectOption (HDBC hdbc, UWORD fOption, PTR pvParam);
-RETCODE SQL_API SQLGetData (HSTMT hstmt, UWORD icol, SWORD fCType,
-    PTR rgbValue, SDWORD cbValueMax, SDWORD FAR * pcbValue);
-RETCODE SQL_API SQLGetFunctions (HDBC hdbc, UWORD fFunction,
-    UWORD FAR * pfExists);
-RETCODE SQL_API SQLGetInfo (HDBC hdbc, UWORD fInfoType, PTR rgbInfoValue,
-    SWORD cbInfoValueMax, SWORD FAR * pcbInfoValue);
-RETCODE SQL_API SQLGetStmtOption (HSTMT hstmt, UWORD fOption, PTR pvParam);
-RETCODE SQL_API SQLGetTypeInfo (HSTMT hstmt, SWORD fSqlType);
-RETCODE SQL_API SQLParamData (HSTMT hstmt, PTR FAR * prgbValue);
-RETCODE SQL_API SQLPutData (HSTMT hstmt, PTR rgbValue, SDWORD cbValue);
-RETCODE SQL_API SQLSetConnectOption (HDBC hdbc, UWORD fOption, UDWORD vParam);
-RETCODE SQL_API SQLSetStmtOption (HSTMT hstmt, UWORD fOption, UDWORD vParam);
-RETCODE SQL_API SQLSpecialColumns (HSTMT hstmt, UWORD fColType,
-    UCHAR FAR * szTableQualifier, SWORD cbTableQualifier,
-    UCHAR FAR * szTableOwner, SWORD cbTableOwner, UCHAR FAR * szTableName,
-    SWORD cbTableName, UWORD fScope, UWORD fNullable);
-RETCODE SQL_API SQLStatistics (HSTMT hstmt, UCHAR FAR * szTableQualifier,
-    SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
-    UCHAR FAR * szTableName, SWORD cbTableName, UWORD fUnique, UWORD fAccuracy);
-RETCODE SQL_API SQLTables (HSTMT hstmt, UCHAR FAR * szTableQualifier,
-    SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
-    UCHAR FAR * szTableName, SWORD cbTableName, UCHAR FAR * szTableType,
-    SWORD cbTableType);
-
-/*
- *  Level 2 function prototypes
- */
-RETCODE SQL_API SQLBrowseConnect (HDBC hdbc, 
-    UCHAR FAR * szConnStrIn, SWORD cbConnStrIn, UCHAR FAR * szConnStrOut, 
-    SWORD cbConnStrOutMax, SWORD FAR * pcbConnStrOut);
-RETCODE SQL_API SQLColumnPrivileges (HSTMT hstmt,
-    UCHAR FAR * szTableQualifier, SWORD cbTableQualifier,
-    UCHAR FAR * szTableOwner, SWORD cbTableOwner, UCHAR FAR * szTableName,
-    SWORD cbTableName, UCHAR FAR * szColumnName, SWORD cbColumnName);
-RETCODE SQL_API SQLDataSources (HENV henv, UWORD fDirection,
-    UCHAR FAR * szDSN, SWORD cbDSNMax, SWORD FAR * pcbDSN,
-    UCHAR FAR * szDescription, SWORD cbDescriptionMax,
-    SWORD FAR * pcbDescription);
-RETCODE SQL_API SQLDescribeParam (HSTMT hstmt, UWORD ipar,
-    SWORD FAR * pfSqlType, UDWORD FAR * pcbColDef, SWORD FAR * pibScale,
-    SWORD FAR * pfNullable);
-RETCODE SQL_API SQLExtendedFetch (HSTMT hstmt, UWORD fFetchType, SDWORD irow,
-    UDWORD FAR * pcrow, UWORD FAR * rgfRowStatus);
-RETCODE SQL_API SQLForeignKeys (HSTMT hstmt, UCHAR FAR * szPkTableQualifier,
-    SWORD cbPkTableQualifier, UCHAR FAR * szPkTableOwner, SWORD cbPkTableOwner,
-    UCHAR FAR * szPkTableName, SWORD cbPkTableName,
-    UCHAR FAR * szFkTableQualifier, SWORD cbFkTableQualifier,
-    UCHAR FAR * szFkTableOwner, SWORD cbFkTableOwner, UCHAR FAR * szFkTableName,
-    SWORD cbFkTableName);
-RETCODE SQL_API SQLMoreResults (HSTMT hstmt);
-RETCODE SQL_API SQLNativeSql (HDBC hdbc, UCHAR FAR * szSqlStrIn,
-    SDWORD cbSqlStrIn, UCHAR FAR * szSqlStr, SDWORD cbSqlStrMax,
-    SDWORD FAR * pcbSqlStr);
-RETCODE SQL_API SQLNumParams (HSTMT hstmt, SWORD FAR * pcpar);
-RETCODE SQL_API SQLParamOptions (HSTMT hstmt, UDWORD crow, UDWORD FAR * pirow);
-RETCODE SQL_API SQLPrimaryKeys (HSTMT hstmt, UCHAR FAR * szTableQualifier,
-    SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
-    UCHAR FAR * szTableName, SWORD cbTableName);
-RETCODE SQL_API SQLProcedureColumns (HSTMT hstmt, UCHAR FAR * szProcQualifier,
-    SWORD cbProcQualifier, UCHAR FAR * szProcOwner, SWORD cbProcOwner,
-    UCHAR FAR * szProcName, SWORD cbProcName, UCHAR FAR * szColumnName,
-    SWORD cbColumnName);
-RETCODE SQL_API SQLProcedures (HSTMT hstmt, UCHAR FAR * szProcQualifier,
-    SWORD cbProcQualifier, UCHAR FAR * szProcOwner, SWORD cbProcOwner,
-    UCHAR FAR * szProcName, SWORD cbProcName);
-RETCODE SQL_API SQLSetPos (HSTMT hstmt, UWORD irow, UWORD fOption, UWORD fLock);
-RETCODE SQL_API SQLTablePrivileges (HSTMT hstmt, UCHAR FAR * szTableQualifier,
-    SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
-    UCHAR FAR * szTableName, SWORD cbTableName);
-
-/*
- *  SDK 2.0 Additional function prototypes
- */
-RETCODE SQL_API SQLDrivers (HENV henv, UWORD fDirection,
-    UCHAR FAR * szDriverDesc, SWORD cbDriverDescMax, SWORD FAR * pcbDriverDesc,
-    UCHAR FAR * szDriverAttributes, SWORD cbDrvrAttrMax,
-    SWORD FAR * pcbDrvrAttr);
-RETCODE SQL_API SQLBindParameter (HSTMT hstmt, UWORD ipar, SWORD fParamType,
-    SWORD fCType, SWORD fSqlType, UDWORD cbColDef, SWORD ibScale, PTR rgbValue,
-    SDWORD cbValueMax, SDWORD FAR * pcbValue);
-
-/*
- *  Depreciated - use SQLSetStmtOptions
- */
-RETCODE SQL_API SQLSetScrollOptions (HSTMT hstmt, UWORD fConcurrency,
-    SDWORD crowKeyset, UWORD crowRowset);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif