OSDN Git Service

Fix "variable not used" warnings when USE_WIDE_UPPER_LOWER is not
authorBruce Momjian <bruce@momjian.us>
Thu, 10 Feb 2011 21:57:25 +0000 (16:57 -0500)
committerBruce Momjian <bruce@momjian.us>
Thu, 10 Feb 2011 21:58:02 +0000 (16:58 -0500)
defined.

src/backend/tsearch/ts_locale.c
src/backend/tsearch/wparser_def.c

index e42c473..c66f4aa 100644 (file)
@@ -243,7 +243,9 @@ char *
 lowerstr_with_len(const char *str, int len)
 {
        char       *out;
+#ifdef USE_WIDE_UPPER_LOWER
        Oid                     collation = DEFAULT_COLLATION_OID; /*TODO*/
+#endif
 
        if (len == 0)
                return pstrdup("");
index 65d0632..3981a50 100644 (file)
@@ -287,7 +287,6 @@ static TParser *
 TParserInit(char *str, int len)
 {
        TParser    *prs = (TParser *) palloc0(sizeof(TParser));
-       Oid                     collation = DEFAULT_COLLATION_OID; /*TODO*/
 
        prs->charmaxlen = pg_database_encoding_max_length();
        prs->str = str;
@@ -300,6 +299,8 @@ TParserInit(char *str, int len)
         */
        if (prs->charmaxlen > 1)
        {
+               Oid                     collation = DEFAULT_COLLATION_OID; /*TODO*/
+               
                prs->usewide = true;
                if ( lc_ctype_is_c(collation) )
                {