postgres.git / summary / log / commit / refs

commit    5b1b3ef742723009e5f9b7a009aa8eda3578305a
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Wed Jul 07 15:13:21 2010 +0000
First released in: 9.0.0

    Adjust mbutils.c so it won't get broken by future pgindent runs.
    To do that, replace L'\0' by (WCHAR) 0.  Perhaps someday we should teach
    pgindent about wide-character literals, but so long as this is the only
    use-case in the entire Postgres sources, a workaround seems easier.


 src/backend/utils/mb/mbutils.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index da93ad0535a..ddaf881ce09 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -4,7 +4,7 @@
  *
  * Tatsuo Ishii
  *
- * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.97 2010/07/06 21:09:00 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.98 2010/07/07 15:13:21 tgl Exp $
  */
 #include "postgres.h"
 
@@ -1016,7 +1016,7 @@ pgwin32_toUTF16(const char *str, int len, int *utf16len)
 	{
 		utf16 = (WCHAR *) palloc(sizeof(WCHAR) * (len + 1));
 		dstlen = MultiByteToWideChar(codepage, 0, str, len, utf16, len);
-		utf16[dstlen] = L'\0';
+		utf16[dstlen] = (WCHAR) 0;
 	}
 	else
 	{
@@ -1029,7 +1029,7 @@ pgwin32_toUTF16(const char *str, int len, int *utf16len)
 
 		utf16 = (WCHAR *) palloc(sizeof(WCHAR) * (len + 1));
 		dstlen = MultiByteToWideChar(CP_UTF8, 0, utf8, len, utf16, len);
-		utf16[dstlen] = L'\0';
+		utf16[dstlen] = (WCHAR) 0;
 
 		if (utf8 != str)
 			pfree(utf8);


[parent: e3243488b06a]