Remove unicode #ifdefs and configure option.

diff --git a/Makefile.am b/Makefile.am
index 9b8706d80f7d1aeda79d440a3c8ce905564ed594..740f682d033bd107754d908122033d4582ec25a0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 #
 # Makefile.am for psqlodbc (PostgreSQL ODBC driver)
 #
-# $Header: /home/heikki/psqlodbc-cvs-copy/psqlodbc/Makefile.am,v 1.15 2004/07/20 19:43:25 dpage Exp $
+# $Header: /home/heikki/psqlodbc-cvs-copy/psqlodbc/Makefile.am,v 1.16 2004/07/21 11:39:15 dpage Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,7 +17,7 @@ psqlodbc_la_SOURCES = \
    environ.c execute.c lobj.c win_md5.c misc.c options.c \
    pgtypes.c psqlodbc.c qresult.c results.c socket.c parse.c \
    statement.c tuple.c tuplelist.c dlg_specific.c odbcapi.c \
-   multibyte.c \
+   multibyte.c odbcapi30w.c odbcapiw.c \
    odbcapi30.c pgapi30.c info30.c descriptor.c
 
 psqlodbc_la_SOURCES += \
@@ -27,17 +27,13 @@ psqlodbc_la_SOURCES += \
    psqlodbc.h qresult.h resource.h socket.h statement.h tuple.h \
    tuplelist.h version.h
 
-if enable_unicode
-psqlodbc_la_SOURCES += \
-   odbcapi30w.c odbcapiw.c win_unicode.c
-endif
-
 EXTRA_psqlodbc_la_SOURCES = md5.c
 
 EXTRA_DIST = README.unix license.txt notice.txt readme.txt odbcinst.ini \
    libtool.m4 psqlodbc_win32.def win32.mak \
    dlg_wingui.c win_setup.h win_md5.c setup.c \
-   psqlodbc.rc psqlodbc.reg
+   win_unicode.c psqlodbc.rc psqlodbc.reg
+   
 MAINTAINERCLEANFILES = \
    Makefile.in config.guess config.h.in config.sub configure \
    install-sh missing mkinstalldirs aclocal.m4 ltmain.sh \

diff --git a/configure.ac b/configure.ac
index 46c6b91c419bd1fb063eca4b80b925bf3648565e..3fafa0ec90e911a2642b1fe50d09a3e58c6e7961 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -55,19 +55,6 @@ PGAC_ARG_REQ(with, odbcver, [  --with-odbcver=VERSION  change default ODBC versi
 AC_MSG_RESULT([$with_odbcver])
 AC_DEFINE_UNQUOTED(ODBCVER, [$with_odbcver], [Define to ODBC version (--with-odbcver)])
 
-# to implement the Unicode driver
-PGAC_ARG_BOOL(enable, unicode, yes,
-              [  --enable-unicode        build ODBC driver for Unicode [[yes]]],
-              [AC_DEFINE(UNICODE_SUPPORT, 1,
-                         [Define to 1 to build with Unicode support (--enable-unicode)])
-               AC_DEFINE(UNICODE, [],
-                         [Define to use wide APIs])
-               AC_DEFINE(SQL_NOUNICODEMAP, [],
-                         [Define to disable mapping SQL* to SQL*W])
-               AC_CHECK_FUNCS(iswascii)])
-
-AM_CONDITIONAL(enable_unicode, [test x"$enable_unicode" = xyes])
-
 AC_CHECK_FUNCS(strtoul strtoll)
 AC_CHECK_LIB(socket, socket)
 

diff --git a/connection.c b/connection.c
index 7c8de653abf23877ab42c4cd376621ec37aa3cad..aeeea89c7f762a8e51455cfa1c6b035e8e50fad4 100644 (file)
--- a/connection.c
+++ b/connection.c
@@ -1008,7 +1008,7 @@ another_version_retry:
        CC_lookup_characterset(self);
        if (CC_get_errornumber(self) != 0)
            return 0;
-#ifdef UNICODE_SUPPORT
+       
        if (self->unicode)
        {
            if (!self->client_encoding ||
@@ -1032,18 +1032,13 @@ another_version_retry:
                }
            }
        }
-#else
-       {
-       }
-#endif /* UNICODE_SUPPORT */
    }
-#ifdef UNICODE_SUPPORT
    else if (self->unicode)
    {
        CC_set_error(self, CONN_NOT_IMPLEMENTED_ERROR, "Unicode isn't supported before 6.4");
        return 0;
    }
-#endif /* UNICODE_SUPPORT */
+
    ci->updatable_cursors = 0;
 #ifdef DRIVER_CURSOR_IMPLEMENT
    if (!ci->drivers.use_declarefetch &&

diff --git a/convert.c b/convert.c
index 018234f82957c0db9a9827c1d62e2364f6f96075..38343a34ff7859304b399621807c2ecfd34af65c 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -39,10 +39,6 @@
 #include "connection.h"
 #include "pgapifunc.h"
 
-#if defined(UNICODE_SUPPORT) && defined(WIN32)
-#define    WIN_UNICODE_SUPPORT
-#endif
-
 #ifdef __CYGWIN__
 #  define TIMEZONE_GLOBAL _timezone
 #elif  defined(WIN32) || defined(HAVE_INT_TIMEZONE)
@@ -412,13 +408,11 @@ copy_and_convert_field(StatementClass *stmt, Int4 field_type, void *value, Int2
    char        midtemp[2][32];
    int         mtemp_cnt = 0;
    GetDataClass *pgdc;
-#ifdef UNICODE_SUPPORT
    BOOL    wchanged =   FALSE;
-#endif /* UNICODE_SUPPORT */
-#ifdef WIN_UNICODE_SUPPORT
+#ifdef WIN32
    SQLWCHAR    *allocbuf = NULL;
    Int4        wstrlen;    
-#endif /* WIN_UNICODE_SUPPORT */
+#endif /* WIN32 */
 
    if (stmt->current_col >= 0)
    {
@@ -693,11 +687,7 @@ inolog("2stime fr=%d\n", std_time.fr);
        mylog("copy_and_convert, SQL_C_DEFAULT: fCType = %d\n", fCType);
    }
 
-#ifdef UNICODE_SUPPORT
    if (fCType == SQL_C_CHAR || fCType == SQL_C_WCHAR
-#else
-   if (fCType == SQL_C_CHAR
-#endif /* UNICODE_SUPPORT */
        || fCType == INTERNAL_ASIS_TYPE)
    {
        /* Special character formatting as required */
@@ -766,7 +756,7 @@ inolog("2stime fr=%d\n", std_time.fr);
                if (pgdc->data_left < 0)
                {
                    BOOL lf_conv = conn->connInfo.lf_conversion;
-#ifdef UNICODE_SUPPORT
+
                    if (fCType == SQL_C_WCHAR)
                    {
                        len = utf8_to_ucs2_lf(neut_str, -1, lf_conv, NULL, 0);
@@ -774,7 +764,7 @@ inolog("2stime fr=%d\n", std_time.fr);
                        wchanged = changed = TRUE;
                    }
                    else
-#endif /* UNICODE_SUPPORT */
+
                    if (PG_TYPE_BYTEA == field_type)
                    {
                        len = convert_from_pgbinary(neut_str, NULL, 0);
@@ -782,7 +772,7 @@ inolog("2stime fr=%d\n", std_time.fr);
                        changed = TRUE;
                    }
                    else
-#ifdef WIN_UNICODE_SUPPORT
+#ifdef WIN32
                    if (fCType == SQL_C_CHAR)
                    {
                        wstrlen = utf8_to_ucs2_lf(neut_str, -1, lf_conv, NULL, 0);
@@ -792,17 +782,17 @@ inolog("2stime fr=%d\n", std_time.fr);
                        changed = TRUE;
                    }
                    else
-#endif /* WIN_UNICODE_SUPPORT */
+#endif /* WIN32 */
                        /* convert linefeeds to carriage-return/linefeed */
                        len = convert_linefeeds(neut_str, NULL, 0, lf_conv, &changed);
                    if (cbValueMax == 0)        /* just returns length
                                                 * info */
                    {
                        result = COPY_RESULT_TRUNCATED;
-#ifdef WIN_UNICODE_SUPPORT
+#ifdef WIN32
                        if (allocbuf)
                            free(allocbuf);
-#endif /* WIN_UNICODE_SUPPORT */
+#endif /* WIN32 */
                        break;
                    }
                    if (!pgdc->ttlbuf)
@@ -814,13 +804,13 @@ inolog("2stime fr=%d\n", std_time.fr);
                            pgdc->ttlbuf = realloc(pgdc->ttlbuf, len + 1);
                            pgdc->ttlbuflen = len + 1;
                        }
-#ifdef UNICODE_SUPPORT
+
                        if (fCType == SQL_C_WCHAR)
                        {
                            utf8_to_ucs2_lf(neut_str, -1, lf_conv, (SQLWCHAR *) pgdc->ttlbuf, len / WCLEN);
                        }
                        else
-#endif /* UNICODE_SUPPORT */
+
                        if (PG_TYPE_BYTEA == field_type)
                        {
                            len = convert_from_pgbinary(neut_str, pgdc->ttlbuf, pgdc->ttlbuflen);
@@ -828,7 +818,7 @@ inolog("2stime fr=%d\n", std_time.fr);
                            len *= 2; 
                        }
                        else
-#ifdef WIN_UNICODE_SUPPORT
+#ifdef WIN32
                        if (fCType == SQL_C_CHAR)
                        {
                            len = WideCharToMultiByte(CP_ACP, 0, allocbuf, wstrlen, pgdc->ttlbuf, pgdc->ttlbuflen, NULL, NULL);
@@ -836,7 +826,7 @@ inolog("2stime fr=%d\n", std_time.fr);
                            allocbuf = NULL;
                        }
                        else
-#endif /* WIN_UNICODE_SUPPORT */
+#endif /* WIN32 */
                            convert_linefeeds(neut_str, pgdc->ttlbuf, pgdc->ttlbuflen, lf_conv, &changed);
                        ptr = pgdc->ttlbuf;
                        pgdc->ttlbufused = len;
@@ -875,13 +865,12 @@ inolog("2stime fr=%d\n", std_time.fr);
                    BOOL    already_copied = FALSE;
 
                    copy_len = (len >= cbValueMax) ? cbValueMax - 1 : len;
-#ifdef UNICODE_SUPPORT
+
                    if (fCType == SQL_C_WCHAR)
                    {
                        copy_len /= WCLEN;
                        copy_len *= WCLEN;
                    }
-#endif /* UNICODE_SUPPORT */
 #ifdef HAVE_LOCALE_H
                    switch (field_type)
                    {
@@ -916,11 +905,11 @@ inolog("2stime fr=%d\n", std_time.fr);
                        /* Copy the data */
                        memcpy(rgbValueBindRow, ptr, copy_len);
                        /* Add null terminator */
-#ifdef UNICODE_SUPPORT
+
                        if (fCType == SQL_C_WCHAR)
                            memset(rgbValueBindRow + copy_len, 0, WCLEN);
                        else
-#endif /* UNICODE_SUPPORT */
+
                        rgbValueBindRow[copy_len] = '\0';
                    }
                    /* Adjust data_left for next time */
@@ -947,7 +936,7 @@ inolog("2stime fr=%d\n", std_time.fr);
                mylog("    SQL_C_CHAR, default: len = %d, cbValueMax = %d, rgbValueBindRow = '%s'\n", len, cbValueMax, rgbValueBindRow);
                break;
        }
-#ifdef UNICODE_SUPPORT
+
        if (SQL_C_WCHAR == fCType && ! wchanged)
        {
            if (cbValueMax > (SDWORD) (WCLEN * len))
@@ -965,7 +954,6 @@ inolog("2stime fr=%d\n", std_time.fr);
                result = COPY_RESULT_TRUNCATED;
            }
        }
-#endif /* UNICODE_SUPPORT */
 
    }
    else
@@ -2634,7 +2622,7 @@ ResolveOneParam(QueryBuild *qb)
            buf = buffer;
            break;
        case SQL_C_CHAR:
-#ifdef WIN_UNICODE_SUPPORT
+#ifdef WIN32
            switch (param_sqltype)
            {
                case SQL_WCHAR:
@@ -2654,15 +2642,13 @@ ResolveOneParam(QueryBuild *qb)
            }
 #else
            buf = buffer;
-#endif /* WIN_UNICODE_SUPPORT */
+#endif /* WIN32 */
            break;
 
-#ifdef UNICODE_SUPPORT
        case SQL_C_WCHAR:
            buf = allocbuf = ucs2_to_utf8((SQLWCHAR *) buffer, used / WCLEN, (UInt4 *) &used, FALSE);
            used *= WCLEN;
            break;
-#endif /* UNICODE_SUPPORT */
 
        case SQL_C_DOUBLE:
            sprintf(param_string, "%.15g",
@@ -2798,11 +2784,9 @@ ResolveOneParam(QueryBuild *qb)
        case SQL_CHAR:
        case SQL_VARCHAR:
        case SQL_LONGVARCHAR:
-#ifdef UNICODE_SUPPORT
        case SQL_WCHAR:
        case SQL_WVARCHAR:
        case SQL_WLONGVARCHAR:
-#endif /* UNICODE_SUPPORT */
 
            CVT_APPEND_CHAR(qb, '\'');  /* Open Quote */
 

diff --git a/execute.c b/execute.c
index a69c39d5dae651e6421fc71183a0f0692196aaaa..981d8bd3c262fca11b63b44ad3a6958566ea3340 100644 (file)
--- a/execute.c
+++ b/execute.c
@@ -987,14 +987,12 @@ PGAPI_PutData(
        ctype = sqltype_to_default_ctype(conn, current_iparam->SQLType);
    if (SQL_NTS == cbValue)
    {
-#ifdef UNICODE_SUPPORT
        if (SQL_C_WCHAR == ctype)
        {
            putlen = WCLEN * ucs2strlen((SQLWCHAR *) rgbValue);
            lenset = TRUE;
        }
        else
-#endif /* UNICODE_SUPPORT */
        if (SQL_C_CHAR == ctype)
        {
            putlen = strlen(rgbValue);
@@ -1006,11 +1004,7 @@ PGAPI_PutData(
        if (cbValue < 0)
            putlen = cbValue;
        else
-#ifdef UNICODE_SUPPORT
        if (ctype == SQL_C_CHAR || ctype == SQL_C_BINARY || ctype == SQL_C_WCHAR)
-#else
-       if (ctype == SQL_C_CHAR || ctype == SQL_C_BINARY)
-#endif /* UNICODE_SUPPORT */
            putlen = cbValue;
        else
            putlen = ctype_length(ctype);

diff --git a/info.c b/info.c
index 1737fb974116a8f3f1d8dc000417c4743655994e..257ae06e891892a0f8e9bfaffde47ecb3be16bf8 100644 (file)
--- a/info.c
+++ b/info.c
@@ -757,15 +757,13 @@ PGAPI_GetInfo(
 
        if (rgbInfoValue)
        {
-#ifdef UNICODE_SUPPORT
            if (conn->unicode)
            {
                len = utf8_to_ucs2(p, len, (SQLWCHAR *) rgbInfoValue, cbInfoValueMax / 2);
                len *= WCLEN;
            }
            else
-#endif /* UNICODE_SUPPORT */
-           strncpy_null((char *) rgbInfoValue, p, (size_t) cbInfoValueMax);
+               strncpy_null((char *) rgbInfoValue, p, (size_t) cbInfoValueMax);
 
            if (len >= cbInfoValueMax)
            {
@@ -1508,10 +1506,10 @@ retry_public_schema:
            goto retry_public_schema;
        }
    }
-#ifdef UNICODE_SUPPORT
+
    if (conn->unicode)
        internal_asis_type = INTERNAL_ASIS_TYPE;
-#endif /* UNICODE_SUPPORT */
+
    result = PGAPI_BindCol(htbl_stmt, 1, internal_asis_type,
                           table_name, MAX_INFO_STRING, NULL);
    if ((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO))
@@ -1780,10 +1778,10 @@ PGAPI_Columns(
 
    conn = SC_get_conn(stmt);
    ci = &(conn->connInfo);
-#ifdef UNICODE_SUPPORT
+
    if (conn->unicode)
        internal_asis_type = INTERNAL_ASIS_TYPE;
-#endif /* UNICODE_SUPPORT */
+
    szSchemaName = szTableOwner;
    cbSchemaName = cbTableOwner;
 
@@ -2336,10 +2334,9 @@ PGAPI_SpecialColumns(
        return result;
    conn = SC_get_conn(stmt);
    ci = &(conn->connInfo);
-#ifdef UNICODE_SUPPORT
+
    if (conn->unicode)
        internal_asis_type = INTERNAL_ASIS_TYPE;
-#endif /* UNICODE_SUPPORT */
 
    stmt->manual_result = TRUE;
    szSchemaName = szTableOwner;
@@ -2604,10 +2601,9 @@ PGAPI_Statistics(
 
    conn = SC_get_conn(stmt);
    ci = &(conn->connInfo);
-#ifdef UNICODE_SUPPORT
+
    if (conn->unicode)
        internal_asis_type = INTERNAL_ASIS_TYPE;
-#endif /* UNICODE_SUPPORT */
 
    if (res = QR_Constructor(), !res)
    {
@@ -3094,10 +3090,9 @@ PGAPI_PrimaryKeys(
    tbl_stmt = (StatementClass *) htbl_stmt;
 
    conn = SC_get_conn(stmt);
-#ifdef UNICODE_SUPPORT
+
    if (conn->unicode)
        internal_asis_type = INTERNAL_ASIS_TYPE;
-#endif /* UNICODE_SUPPORT */
 
    pktab = make_string(szTableName, cbTableName, NULL, 0);
    if (pktab == NULL || pktab[0] == '\0')
@@ -3656,10 +3651,10 @@ PGAPI_ForeignKeys(
    fk_table_needed = make_string(szFkTableName, cbFkTableName, NULL, 0);
 
    conn = SC_get_conn(stmt);
-#ifdef UNICODE_SUPPORT
+
    if (conn->unicode)
        internal_asis_type = INTERNAL_ASIS_TYPE;
-#endif /* UNICODE_SUPPORT */
+
    pkey_text = fkey_text = NULL;
    pkey_alloced = fkey_alloced = FALSE;
 

diff --git a/info30.c b/info30.c
index 9496b9569c13c9cf957321412439dcb6425121bb..0b4623f6bf9332d1ae2253ecc256547da8e99c1a 100644 (file)
--- a/info30.c
+++ b/info30.c
@@ -373,15 +373,14 @@ PGAPI_GetInfo30(HDBC hdbc, UWORD fInfoType, PTR rgbInfoValue,
                 
        if (rgbInfoValue)
        {
-#ifdef UNICODE_SUPPORT
+
            if (conn->unicode)
            {
                len = utf8_to_ucs2(p, len, (SQLWCHAR *) rgbInfoValue, cbInfoValueMax / 2);
                len *= WCLEN;
            }
            else
-#endif /* UNICODE_SUPPORT */
-           strncpy_null((char *) rgbInfoValue, p, (size_t) cbInfoValueMax);
+               strncpy_null((char *) rgbInfoValue, p, (size_t) cbInfoValueMax);
 
            if (len >= cbInfoValueMax)
            {

diff --git a/multibyte.c b/multibyte.c
index 17e119ec36998eb06c554d6feef61fbbb5305fb6..2a47fd067505178fa99eaefdb2de8d5e6e4e5dcf 100644 (file)
--- a/multibyte.c
+++ b/multibyte.c
@@ -376,59 +376,7 @@ CC_lookup_characterset(ConnectionClass *self)
        encstr = CC_lookup_cs_new(self);
    if (self->client_encoding)
        free(self->client_encoding);
-#ifndef    UNICODE_SUPPORT
-#ifdef WIN32
-   else
-   {
-       const char *wenc = NULL;
-       switch (GetACP())
-       {
-           case 932:
-               wenc = "SJIS";
-               break;
-           case 936:
-               if (!encstr || PG_VERSION_GT(self, 7.2))
-                   wenc = "GBK";
-               break;
-           case 949:
-               if (!encstr ||
-                 (PG_VERSION_GT(self, 7.2) && stricmp(encstr, "EUC_KR")))  
-                   wenc = "UHC";
-               break;
-           case 950:
-               wenc = "BIG5";
-               break;\r
-                        case 1250:\r
-                                wenc = "WIN1250";\r
-                                break;
-           case 1252:
-               if (PG_VERSION_GE(self, 7.2))
-                   wenc = "latin9";
-               else
-                   wenc = "latin1";
-               break;
-       }
-       if (wenc && (!encstr || stricmp(encstr, wenc)))
-       {
-           QResultClass    *res;
-           char        query[64];
-           int     errnum = CC_get_errornumber(self);
 
-           sprintf(query, "set client_encoding to '%s'", wenc);
-           res = CC_send_query(self, query, NULL, CLEAR_RESULT_ON_ABORT);
-           CC_set_errornumber(self, errnum);
-           if (res)
-           {
-               self->client_encoding = strdup(wenc);
-               self->ccsc = pg_CS_code(self->client_encoding);
-               QR_Destructor(res);
-               free(encstr);
-               return;
-           }
-       }
-   }
-#endif /* WIN32 */
-#endif /* UNICODE_SUPPORT */
    if (encstr)
    {
        self->client_encoding = encstr;

diff --git a/options.c b/options.c
index 3bf551950f36bf589bd735e37b1be6295b07846d..9b6e12fae541b2acdc1f797b052a9cd65a498fbe 100644 (file)
--- a/options.c
+++ b/options.c
@@ -477,7 +477,6 @@ PGAPI_SetConnectOption(
                if (fOption == 30002 && vParam)
                {
                    int cmp;
-#ifdef UNICODE_SUPPORT
                    char *asPara;
                    if (conn->unicode)
                    {
@@ -486,8 +485,8 @@ PGAPI_SetConnectOption(
                        free(asPara);
                    }
                    else
-#endif /* UNICODE_SUPPORT */
-                   cmp = strncmp((char *) vParam, "Microsoft Jet", 13);
+                       cmp = strncmp((char *) vParam, "Microsoft Jet", 13);
+                   
                    if (0 == cmp)
                    {
                        mylog("Microsoft Jet !!!!\n");

diff --git a/pgtypes.c b/pgtypes.c
index ff37ac9dce14faf017b4c2223f1c7007df8e27f6..caab8ebcff8bb69e72014082049a36c101ae27ff 100644 (file)
--- a/pgtypes.c
+++ b/pgtypes.c
@@ -100,11 +100,9 @@ Int2       sqlTypes[] = {
    SQL_TINYINT,
    SQL_VARBINARY,
    SQL_VARCHAR,
-#ifdef UNICODE_SUPPORT
    SQL_WCHAR,
    SQL_WVARCHAR,
    SQL_WLONGVARCHAR,
-#endif /* UNICODE_SUPPORT */
    0
 };
 
@@ -132,11 +130,9 @@ sqltype_to_pgtype(StatementClass *stmt, SWORD fSqlType)
            pgType = PG_TYPE_BPCHAR;
            break;
 
-#ifdef UNICODE_SUPPORT
        case SQL_WCHAR:
            pgType = PG_TYPE_BPCHAR;
            break;
-#endif /* UNICODE_SUPPORT */
 
        case SQL_BIT:
            pgType = ci->drivers.bools_as_char ? PG_TYPE_CHAR : PG_TYPE_BOOL;
@@ -179,11 +175,9 @@ sqltype_to_pgtype(StatementClass *stmt, SWORD fSqlType)
            pgType = ci->drivers.text_as_longvarchar ? PG_TYPE_TEXT : PG_TYPE_VARCHAR;
            break;
 
-#ifdef UNICODE_SUPPORT
        case SQL_WLONGVARCHAR:
            pgType = ci->drivers.text_as_longvarchar ? PG_TYPE_TEXT : PG_TYPE_VARCHAR;
            break;
-#endif /* UNICODE_SUPPORT */
 
        case SQL_REAL:
            pgType = PG_TYPE_FLOAT4;
@@ -216,11 +210,9 @@ sqltype_to_pgtype(StatementClass *stmt, SWORD fSqlType)
            pgType = PG_TYPE_VARCHAR;
            break;
 
-#if    UNICODE_SUPPORT
        case SQL_WVARCHAR:
            pgType = PG_TYPE_VARCHAR;
            break;
-#endif /* UNICODE_SUPPORT */
 
        default:
            pgType = 0;         /* ??? */
@@ -261,7 +253,6 @@ pgtype_to_concise_type(StatementClass *stmt, Int4 type, int col)
        case PG_TYPE_NAME:
            return SQL_CHAR;
 
-#ifdef UNICODE_SUPPORT
        case PG_TYPE_BPCHAR:
            if (col >= 0 &&
                getCharColumnSize(stmt, type, col, UNKNOWNS_AS_MAX) > ci->drivers.max_varchar_size)
@@ -279,23 +270,6 @@ pgtype_to_concise_type(StatementClass *stmt, Int4 type, int col)
                (conn->unicode ? SQL_WLONGVARCHAR : SQL_LONGVARCHAR) :
                (conn->unicode ? SQL_WVARCHAR : SQL_VARCHAR);
 
-#else
-       case PG_TYPE_BPCHAR:
-           if (col >= 0 &&
-               getCharColumnSize(stmt, type, col, UNKNOWNS_AS_MAX) > ci->drivers.max_varchar_size)
-               return SQL_LONGVARCHAR;
-           return SQL_CHAR;
-
-       case PG_TYPE_VARCHAR:
-           if (col >= 0 &&
-               getCharColumnSize(stmt, type, col, UNKNOWNS_AS_MAX) > ci->drivers.max_varchar_size)
-               return SQL_LONGVARCHAR;
-           return SQL_VARCHAR;
-
-       case PG_TYPE_TEXT:
-           return ci->drivers.text_as_longvarchar ? SQL_LONGVARCHAR : SQL_VARCHAR;
-#endif /* UNICODE_SUPPORT */
-
        case PG_TYPE_BYTEA:
            if (ci->bytea_as_longvarbinary)
                return SQL_LONGVARBINARY;
@@ -466,14 +440,12 @@ pgtype_to_ctype(StatementClass *stmt, Int4 type)
            return SQL_C_BINARY;
        case PG_TYPE_LO_UNDEFINED:
            return SQL_C_BINARY;
-#ifdef UNICODE_SUPPORT
        case PG_TYPE_BPCHAR:
        case PG_TYPE_VARCHAR:
        case PG_TYPE_TEXT:
            if (conn->unicode && ! conn->ms_jet && ! stmt->manual_result)
                return SQL_C_WCHAR;
            return SQL_C_CHAR;
-#endif /* UNICODE_SUPPORT */
 
        default:
            /* hack until permanent type is available */
@@ -1466,15 +1438,12 @@ sqltype_to_default_ctype(const ConnectionClass *conn, Int2 sqltype)
        case SQL_BIGINT:
            return ALLOWED_C_BIGINT;
 #endif
-
-#ifdef UNICODE_SUPPORT
        case SQL_WCHAR:
        case SQL_WVARCHAR:
        case SQL_WLONGVARCHAR:
            if (conn->ms_jet || ! conn->unicode)
                return SQL_C_CHAR;
            return SQL_C_WCHAR;
-#endif /* UNICODE_SUPPORT */
 
        case SQL_BIT:
            return SQL_C_BIT;
@@ -1581,9 +1550,7 @@ ctype_length(Int2 ctype)
 
        case SQL_C_BINARY:
        case SQL_C_CHAR:
-#ifdef UNICODE_SUPPORT
        case SQL_C_WCHAR:
-#endif /* UNICODE_SUPPORT */
            return 0;
 
        default:                /* should never happen */

diff --git a/win32.mak b/win32.mak
index 8a397462ef6920b1969fd12aa5a760f9189327d9..b523bcb9bbdd8ea2366d16b6918888b561fddc66 100644 (file)
--- a/win32.mak
+++ b/win32.mak
@@ -93,7 +93,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "ODBCVER=0x0300" /D "UNICODE_SUPPORT" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "ODBCVER=0x0300" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -230,7 +230,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "ODBCVER=0x0300" /D "UNICODE_SUPPORT" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "ODBCVER=0x0300" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<