Call AC_CHECK_SIZEOF(long int) in configure.ac and always place config.h before sql...

diff --git a/configure.ac b/configure.ac
index d7de0f2c94001827e3a25887ce25c9e63fe80678..f60a6e6c92574080d0b3ba5c4180a8efbcda7adc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -235,6 +235,7 @@ AC_HEADER_TIME
 
 # unixODBC wants the following to get sane behavior for ODBCINT64
 AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long int)  # for unixODBC
 AC_CHECK_SIZEOF(void *)
 AC_CHECK_TYPES(long long)
 AC_CHECK_TYPES(signed char)

diff --git a/test/Makefile.in b/test/Makefile.in
index 6aeab8f14c6d25a774f5d08a1153fc2ee4221402..3f9a9af0bfee5e516c43edf32c89cbef0153b55a 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -15,7 +15,7 @@ TESTNAMES = $(patsubst exe/%-test,%, $(TESTBINS))
 # Set by autoconf
 LDFLAGS = @LDFLAGS@
 CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = @CPPFLAGS@ -I.. # config.h
 ODBC_CONFIG = @ODBC_CONFIG@
 PROVE = @PROVE@
 

diff --git a/test/reset-db.c b/test/reset-db.c
index 766f1a2d17fd932e791b0a60d88abd007f90b976..cd58726beed43f01b85b9b9559ca9cf49f3e6a7a 100644 (file)
--- a/test/reset-db.c
+++ b/test/reset-db.c
@@ -15,9 +15,6 @@
 #define    snprintf _snprintf
 #endif
 
-#include <sql.h>
-#include <sqlext.h>
-
 #include "src/common.h"
 
 SQLHENV env;

diff --git a/test/src/common.h b/test/src/common.h
index 0315f8964f48843e4e65253afe831e2b1af0d171..4794736d664cfe18a2d4d9e552fb3ebfd57a5e02 100644 (file)
--- a/test/src/common.h
+++ b/test/src/common.h
@@ -4,6 +4,8 @@
 
 #ifdef WIN32
 #include <windows.h>
+#else
+#include "config.h"
 #endif
 
 #include <sql.h>