Don't reuse the UNICODE macro

diff --git a/multibyte.c b/multibyte.c
index 60f9fe7bca997571599f4ae42700e0bc244fb6cf..3871db3a3d54ee4bf2004520645c66d675374c0c 100644 (file)
--- a/multibyte.c
+++ b/multibyte.c
@@ -28,7 +28,7 @@ pg_CS CS_Table[] =
    { "EUC_KR", EUC_KR },
    { "EUC_TW", EUC_TW },
    { "JOHAB", JOHAB },
-   { "UNICODE",    UNICODE },
+   { "UNICODE",    PG_UNICODE },
    { "UTF8",   UTF8 },     /* Corresponding from Version 8.1 */
    { "MULE_INTERNAL",MULE_INTERNAL },
    { "LATIN1", LATIN1 },

diff --git a/multibyte.h b/multibyte.h
index 120e71f6074b248c191c6996ac5d2e9877a21f66..f4143d266caa4a45510623ad1e5fef7502e0ef58 100644 (file)
--- a/multibyte.h
+++ b/multibyte.h
@@ -45,7 +45,8 @@
 #define WIN1250                32  /* windows-1250 */
 #define GB18030                33  /* GB18030 */
 
-#define UNICODE                34  /* UNICODE ( < Ver8.1) */
+#define PG_UNICODE         34  /* UNICODE ( < Ver8.1) */
+                       /* Can't call it UNICODE as that's already used */
 #define TCVN               35  /* TCVN ( < Ver8.1) */
 #define ALT                36  /* ALT ( < Var8.1) */
 #define WIN                37  /* WIN ( < Ver8.1) */