lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2026-03-10 00:20:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move the ODBC wide support in its own file

Browse Source 
Enabling wide functions can break ascii one, like DriveConnect()
This commit is contained in:
Nirgal Vourgère
2013-07-09 00:54:03 +02:00
parent c908a4f4de
commit a021708dae
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/odbc/Makefile.am
View File

@@ -1,8 +1,15 @@
noinst_PROGRAMS = unittest
lib_LTLIBRARIES = libmdbodbc.la
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(ODBC_CFLAGS)
libmdbodbc_la_SOURCES= odbc.c connectparams.c mdbodbc.h connectparams.h
libmdbodbc_la_LIBADD= ../libmdb/libmdb.la ../sql/libmdbsql.la
libmdbodbc_la_LDFLAGS = -avoid-version -export-symbols-regex '^(SQL|ODBCINST)'
libmdbodbc_la_SOURCES = odbc.c connectparams.c mdbodbc.h connectparams.h
libmdbodbc_la_LIBADD = ../libmdb/libmdb.la ../sql/libmdbsql.la
libmdbodbc_la_LDFLAGS = -avoid-version -export-symbols-regex '^(SQL|ODBCINST)'
if ICONV
lib_LTLIBRARIES += libmdbodbcW.la
libmdbodbcW_la_SOURCES = $(libmdbodbc_la_SOURCES)
libmdbodbcW_la_LIBADD = $(libmdbodbc_la_LIBADD)
libmdbodbcW_la_LDFLAGS = $(libmdbodbc_la_LDFLAGS)
libmdbodbcW_la_CFLAGS = -D ENABLE_ODBC_W=1
endif
LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la

5
src/odbc/odbc.c
View File

@@ -16,11 +16,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifdef HAVE_ICONV
/* Disable ODBC wide char if iconv is not available */
#define ENABLE_ODBC_W
#endif
#ifdef ENABLE_ODBC_W
#define SQL_NOUNICODEMAP
#define UNICODE