Below is the patch I applied.
I'm the one who originally posted the patch. But the
include/mb/pg_wchar.h was as complete source in the ZIP attached to
my mail on 02.11.04 as well as patch in my mail on 30.11.04 with
correct contents.
And also in the confirmation of Bruce Momjian from 30.11.04 Your patch
has been added to the PostgreSQL unapplied patches list ... there was
the correct file contents listed.
You will notice there is no mention of include/mb/pg_wchar.h anywhere
in the message, and it was not in the zip file, at least in the most
recent version I applied.
FYI, this patch went through several revisions as people commented on it
so it is very possible some files get lost during the revisions.
---
pgman wrote:
Your patch has been added to the PostgreSQL unapplied patches list at:
http://momjian.postgresql.org/cgi-bin/pgpatches
It will be applied as soon as one of the PostgreSQL committers reviews
and approves it.
---
Roland Volkmann wrote:
Hallo Alvaron
Alvaro Herrera schrieb am 30.11.2004 17:38:
On Tue, Nov 30, 2004 at 02:05:31AM +0100, Roland Volkmann wrote:
this is the first time, I use CVS (TortoisCVS), so I hope the result is
what you were missing:
You have to include the new files separately. And please send context
diffs, not unified diffs.
sorry, but I can't find any option for changing patch style in
TortoiseCVS. And the patches of other developers look similar to me.
The new files were attached as ZIP-file to my mail on 02.11.2004. Please
find these files again attached to this mail:
Index:
src/backend/utils/mb/conversion_procs/utf8_and_win1252/utf8_and_win1252.c
Index: src/backend/utils/mb/conversion_procs/utf8_and_win1252/Makefile
Index: src/backend/utils/mb/Unicode/utf8_to_win1252.map
Index: src/backend/utils/mb/Unicode/win1252_to_utf8.map
===
++ new files
Also there's a typo here:
thank you, you're right. And here is the corrected patch which shoult
replace the earlier faulty one:
Index: src/backend/utils/mb/encnames.c
===
RCS file:
Y:\CVS_Repositories\postgres.org/postgresql-8.0.0beta5/src/backend/utils/mb/encnames.c,v
retrieving revision 1.1
diff -u -r1.1 encnames.c
--- src/backend/utils/mb/encnames.c30 Nov 2004 23:42:16 -1.1
+++ src/backend/utils/mb/encnames.c30 Nov 2004 23:56:27 -
@@ -194,6 +194,9 @@
win1251, PG_WIN1251
},/* alias for Windows-1251 */
{
+win1252, PG_WIN1252
+},/* alias for Windows-1252 */
+{
win1256, PG_WIN1256
},/* alias for Windows-1256 */
{
@@ -221,6 +224,9 @@
windows1251, PG_WIN1251
},/* Windows-1251; Microsoft */
{
+windows1252, PG_WIN1252
+},/* Windows-1251; Microsoft */
+{
windows1256, PG_WIN1256
},/* Windows-1256; Microsoft */
{
@@ -342,6 +348,9 @@
},
{
WIN1250, PG_WIN1250
+},
+{
+WIN1252, PG_WIN1252
},
{
SJIS, PG_SJIS
===
With best regards,
Roland
#-
#
# $PostgreSQL:
pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1252/Makefile,v 1.3
2004/10/31 22:40:41 pgsql Exp $
#
#-
subdir = src/backend/utils/mb/conversion_procs/utf8_and_win1252
top_builddir = ../../../../../..
include $(top_builddir)/src/Makefile.global
NAME:= utf8_and_win1252
include $(srcdir)/../proc.mk
/*-
*
*WIN1252 and UTF-8
*
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
*$PostgreSQL:
pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1252/utf8_and_win1252.c,v
1.8 2004/10/31 04:12:59 momjian Exp $
*
*-
*/
#include postgres.h
#include fmgr.h
#include mb/pg_wchar.h
#include ../../Unicode/utf8_to_win1252.map
#include ../../Unicode/win1252_to_utf8.map
PG_FUNCTION_INFO_V1(utf_to_win1252);
PG_FUNCTION_INFO_V1(win1252_to_utf);
extern Datum
