lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-04-05 20:31:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

include odbcinstext.h in connectparams.c

Browse Source 
This is possible since unixodbc version 2.2.10 as they fixed the including
of local files from public headers.
This commit is contained in:
Nirgal Vourgère 2013-06-30 15:29:16 +02:00
parent 5cc23dd447
commit 6b24b25454
2 changed files with 3 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
INSTALL
View File

@ -50,7 +50,8 @@ mutually exclusive.
--enable-sql will cause the SQL engine to be built, you must have flex --enable-sql will cause the SQL engine to be built, you must have flex
and bison (or yacc) installed for this option. and bison (or yacc) installed for this option.
--with-unixodbc specifies the location of the unixODBC driver manager and --with-unixodbc specifies the location of the unixODBC driver manager and
causes the unixODBC driver to be built. causes the unixODBC driver to be built. You need version
2.2.10 or above.
--with-iodbc specifies the location of the iODBC driver manager and --with-iodbc specifies the location of the iODBC driver manager and
causes the iODBC driver to be built. causes the iODBC driver to be built.

41
src/odbc/connectparams.c
View File

@ -528,46 +528,7 @@ static gboolean cleanup (gpointer key, gpointer value, gpointer user_data)
#ifdef UNIXODBC #ifdef UNIXODBC
#include <odbcinstext.h>
/*
* Begin BIG Hack.
*
* We need these from odbcinstext.h but it wants to
* include <log.h> and <ini.h>, which are not in the
* standard include path. XXX smurph
* confirmed by unixODBC stuff, odbcinstext.h shouldn't be installed. freddy77
*/
#define INI_MAX_LINE 1000
#define INI_MAX_OBJECT_NAME INI_MAX_LINE
#define INI_MAX_PROPERTY_NAME INI_MAX_LINE
#define INI_MAX_PROPERTY_VALUE INI_MAX_LINE
#define ODBCINST_PROMPTTYPE_LABEL 0 /* readonly */
#define ODBCINST_PROMPTTYPE_TEXTEDIT 1
#define ODBCINST_PROMPTTYPE_LISTBOX 2
#define ODBCINST_PROMPTTYPE_COMBOBOX 3
#define ODBCINST_PROMPTTYPE_FILENAME 4
#define ODBCINST_PROMPTTYPE_HIDDEN 5
#define ODBCINST_PROMPTTYPE_TEXTEDIT_PASSWORD 6
typedef struct tODBCINSTPROPERTY
{
struct tODBCINSTPROPERTY *pNext; /* pointer to next property, NULL if last property */
char szName[INI_MAX_PROPERTY_NAME + 1]; /* property name */
char szValue[INI_MAX_PROPERTY_VALUE + 1]; /* property value */
int nPromptType; /* PROMPTTYPE_TEXTEDIT, PROMPTTYPE_LISTBOX, PROMPTTYPE_COMBOBOX, PROMPTTYPE_FILENAME */
char **aPromptData; /* array of pointers terminated with a NULL value in array. */
char *pszHelp; /* help on this property (driver setups should keep it short) */
void *pWidget; /* CALLER CAN STORE A POINTER TO ? HERE */
int bRefresh; /* app should refresh widget ie Driver Setup has changed aPromptData or szValue */
void *hDLL; /* for odbcinst internal use... only first property has valid one */
}
ODBCINSTPROPERTY, *HODBCINSTPROPERTY;
/*
* End BIG Hack.
*/
int int
ODBCINSTGetProperties(HODBCINSTPROPERTY hLastProperty) ODBCINSTGetProperties(HODBCINSTPROPERTY hLastProperty)