Commit7167e05

committed

Move check for ucol_strcollUTF8 to pg_locale_icu.c

The result of the check is only used by pg_locale_icu.c.Author: Andreas KarlssonDiscussion:https://postgr.es/m/4548a168-62cd-457b-8d06-9ba7b985c477@proxel.se

1 parent32a7deb commit7167e05Copy full SHA for 7167e05

File tree

+12

-13

lines changed

+12

-13

lines changed

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,18 @@`
`14`	`14`	`#ifdefUSE_ICU`
`15`	`15`	`#include<unicode/ucnv.h>`
`16`	`16`	`#include<unicode/ustring.h>`
	`17`	`+`
	`18`	`+/*`
	`19`	`+ * ucol_strcollUTF8() was introduced in ICU 50, but it is buggy before ICU 53.`
	`20`	`+ * (see`
	`21`	`+ * <https://www.postgresql.org/message-id/flat/f1438ec6-22aa-4029-9a3b-26f79d330e72%40manitou-mail.org>)`
	`22`	`+ */`
	`23`	`+#ifU_ICU_VERSION_MAJOR_NUM >=53`
	`24`	`+#defineHAVE_UCOL_STRCOLLUTF8 1`
	`25`	`+#else`
	`26`	`+#undef HAVE_UCOL_STRCOLLUTF8`
	`27`	`+#endif`
	`28`	`+`
`17`	`29`	`#endif`
`18`	`30`
`19`	`31`	`#include"access/htup_details.h"`

Lines changed: 0 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,19 +16,6 @@`
`16`	`16`	`#include<unicode/ucol.h>`
`17`	`17`	`#endif`
`18`	`18`
`19`		`-#ifdefUSE_ICU`
`20`		`-/*`
`21`		`- * ucol_strcollUTF8() was introduced in ICU 50, but it is buggy before ICU 53.`
`22`		`- * (see`
`23`		`- * <https://www.postgresql.org/message-id/flat/f1438ec6-22aa-4029-9a3b-26f79d330e72%40manitou-mail.org>)`
`24`		`- */`
`25`		`-#ifU_ICU_VERSION_MAJOR_NUM >=53`
`26`		`-#defineHAVE_UCOL_STRCOLLUTF8 1`
`27`		`-#else`
`28`		`-#undef HAVE_UCOL_STRCOLLUTF8`
`29`		`-#endif`
`30`		`-#endif`
`31`		`-`
`32`	`19`	`/* use for libc locale names */`
`33`	`20`	`#defineLOCALE_NAME_BUFLEN 128`
`34`	`21`

Comments

(0)