diff options
Diffstat (limited to 'src/interfaces/odbc/dlg_specific.h')
| -rw-r--r-- | src/interfaces/odbc/dlg_specific.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/interfaces/odbc/dlg_specific.h b/src/interfaces/odbc/dlg_specific.h index 044992a09f5..5be8b4fa508 100644 --- a/src/interfaces/odbc/dlg_specific.h +++ b/src/interfaces/odbc/dlg_specific.h @@ -31,18 +31,17 @@ /* INI File Stuff */ #ifndef WIN32 -#define ODBC_INI ".odbc.ini" -#ifdef ODBCINST -#define xstr(s) str(s) -#define str(s) #s -#define ODBCINST_INI xstr(ODBCINST) "/odbcinst.ini" -#else -#define ODBCINST_INI "/etc/odbcinst.ini" -#endif -#else -#define ODBC_INI "ODBC.INI" /* ODBC initialization file */ -#define ODBCINST_INI "ODBCINST.INI" /* ODBC Installation file */ -#endif +# define ODBC_INI ".odbc.ini" +# ifdef ODBCINSTDIR +# define ODBCINST_INI ODBCINSTDIR "/odbcinst.ini" +# else +# define ODBCINST_INI "/etc/odbcinst.ini" +# warning "location of odbcinst.ini file defaulted to /etc" +# endif +#else /* WIN32 */ +# define ODBC_INI "ODBC.INI" /* ODBC initialization file */ +# define ODBCINST_INI "ODBCINST.INI" /* ODBC Installation file */ +#endif /* WIN32 */ #define INI_DSN DBMS_NAME /* Name of default Datasource in ini file (not used?) */ |