summaryrefslogtreecommitdiff
path: root/src/include/tsearch
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2008-06-17 16:09:06 +0000
committerBruce Momjian <bruce@momjian.us>2008-06-17 16:09:06 +0000
commitdc69c0362f291897273a67cb0ccf5d03d11026f2 (patch)
tree0082403981e6aff67e49b20867721664091dabc1 /src/include/tsearch
parent2e835a4961eab760d1b08aeebd40a755d507999f (diff)
downloadpostgresql-dc69c0362f291897273a67cb0ccf5d03d11026f2.tar.gz
Move USE_WIDE_UPPER_LOWER define to c.h, and remove TS_USE_WIDE and use
USE_WIDE_UPPER_LOWER instead.
Diffstat (limited to 'src/include/tsearch')
-rw-r--r--src/include/tsearch/ts_locale.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/include/tsearch/ts_locale.h b/src/include/tsearch/ts_locale.h
index 383acbc1bb..adeeebac18 100644
--- a/src/include/tsearch/ts_locale.h
+++ b/src/include/tsearch/ts_locale.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1998-2008, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/include/tsearch/ts_locale.h,v 1.5 2008/01/01 19:45:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/tsearch/ts_locale.h,v 1.6 2008/06/17 16:09:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,13 +29,9 @@
#include <wctype.h>
#endif
-#if defined(HAVE_WCSTOMBS) && defined(HAVE_TOWLOWER)
-#define TS_USE_WIDE
-#endif
-
#define TOUCHAR(x) (*((const unsigned char *) (x)))
-#ifdef TS_USE_WIDE
+#ifdef USE_WIDE_UPPER_LOWER
extern size_t wchar2char(char *to, const wchar_t *from, size_t tolen);
extern size_t char2wchar(wchar_t *to, size_t tolen, const char *from, size_t fromlen);
@@ -49,7 +45,7 @@ extern int t_isprint(const char *ptr);
#define t_iseq(x,c) (TOUCHAR(x) == (unsigned char) (c))
#define COPYCHAR(d,s) memcpy(d, s, pg_mblen(s))
-#else /* not TS_USE_WIDE */
+#else /* not USE_WIDE_UPPER_LOWER */
#define t_isdigit(x) isdigit(TOUCHAR(x))
#define t_isspace(x) isspace(TOUCHAR(x))
@@ -58,7 +54,7 @@ extern int t_isprint(const char *ptr);
#define t_iseq(x,c) (TOUCHAR(x) == (unsigned char) (c))
#define COPYCHAR(d,s) (*((unsigned char *) (d)) = TOUCHAR(s))
-#endif /* TS_USE_WIDE */
+#endif /* USE_WIDE_UPPER_LOWER */
extern char *lowerstr(const char *str);
extern char *lowerstr_with_len(const char *str, int len);