Rename HAVE_SQLGETPRIVATEPROFILESTRING to something resonable in length

and readability.

diff --git a/configure b/configure
index 75a0457dbb707be06e538983957c5aa4c7b5e4b8..4ea50ed3b40ed0cfaa9e35135d91db9ad7118573 100755 (executable)
--- a/configure
+++ b/configure
@@ -1968,7 +1968,7 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   cat >> confdefs.h <<\EOF
-#define HAVE_SQLGETPRIVATEPROFILESTRING 1
+#define HAVE_SQLGET_PRIV_PROFILE 1
 EOF
 
     SHLIB_ODBC="$LDFLAGS_ODBC -L$unixODBC_libs -lodbcinst" 

diff --git a/configure.in b/configure.in
index 289e8d029255b5764328e6c8c79df269819897ca..fdf3fc6abc5720b7df0e3e09dda7cb818eae0e51 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -585,7 +585,7 @@ then
   LIBS="-L$unixODBC_libs $LIBS"
   
   AC_CHECK_LIB(odbcinst,SQLGetPrivateProfileString,
-    [AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING)
+    [AC_DEFINE(HAVE_SQL_GET_PRIV_PROFILE)
     SHLIB_ODBC="$LDFLAGS_ODBC -L$unixODBC_libs -lodbcinst" ],
     [LIBS="$save_LIBS"] )
 fi

diff --git a/src/interfaces/odbc/dlg_specific.c b/src/interfaces/odbc/dlg_specific.c
index ebe16c1c6e31d9225103e83f6e80f90894be98aa..f75d566f5a8e32e98aa9c88c4b4a1378160189b4 100644 (file)
--- a/src/interfaces/odbc/dlg_specific.c
+++ b/src/interfaces/odbc/dlg_specific.c
@@ -23,7 +23,7 @@
 #ifndef WIN32
 #include <string.h>
 #include "gpps.h"
-#ifndef HAVE_SQLGETPRIVATEPROFILESTRING
+#ifndef HAVE_SQL_GET_PRIV_PROFILE
 #define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
 #define SQLWritePrivateProfileString(a,b,c,d) WritePrivateProfileString(a,b,c,d)
 #endif

diff --git a/src/interfaces/odbc/misc.h b/src/interfaces/odbc/misc.h
index 9796d0ce5745f52d2a48724d73b635c23280ecf7..f8ea9de3873b7a8c821b4e654aafd99d5ce86114 100644 (file)
--- a/src/interfaces/odbc/misc.h
+++ b/src/interfaces/odbc/misc.h
@@ -16,7 +16,7 @@
 
 #ifndef WIN32
 #include "gpps.h"
-#ifndef HAVE_SQLGETPRIVATEPROFILESTRING
+#ifndef HAVE_SQL_GET_PRIV_PROFILE
 #define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
 #endif
 #endif