Fix ODBC warnings about missing parens and pg_ismb not used (added

#ifdef NOT_USED).

diff --git a/src/interfaces/odbc/multibyte.c b/src/interfaces/odbc/multibyte.c
index 9c8c7dae6a1d81b398ab1c0dd9571535fb42a44d..3cc3efe350ace498a4344a06d6f1b6dc937bd2d3 100644 (file)
--- a/src/interfaces/odbc/multibyte.c
+++ b/src/interfaces/odbc/multibyte.c
@@ -59,6 +59,7 @@ pg_CS CS_Table[] =
    { "OTHER", OTHER }
 };
 
+#ifdef NOT_USED
 static int
 pg_ismb(int characterset_code)
 {
@@ -70,6 +71,7 @@ pg_ismb(int characterset_code)
    }
    return (MB_CHARACTERSET[i]);
 }
+#endif
 
 int
 pg_CS_code(const unsigned char *characterset_string)
@@ -227,8 +229,8 @@ pg_CS_stat(int stat,unsigned int character,int characterset_code)
                else if (stat == 4 &&
                    character > 0xa0)
                    stat = 3;
-               else if (stat == 3 ||
-                   stat < 2 &&
+               else if ((stat == 3 ||
+                   stat < 2) &&
                    character > 0xa0)
                    stat = 2;
                else if (stat == 2)