diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-10-06 03:02:29 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-10-06 03:02:29 +0000 |
| commit | e1ebac319d1491e54dd8e3e457d48aa766771366 (patch) | |
| tree | 48a57b8f779c2b8a1d68ef953f4b173168d5c3a6 /src/interfaces | |
| parent | c77a29a14efe69851a087989e3520ed560fa8862 (diff) | |
| download | postgresql-e1ebac319d1491e54dd8e3e457d48aa766771366.tar.gz | |
Here are the patches against the current source tree. I have run the
regression test on a FreeBSD box with both non-MULTIBYTE and
MULTIBYTE-enabled, and confirmed that the results are same.
However I do not tested on PCs(I don't have access to win). Please let
me know if the patches break anything on PCs.
Also please note that the patch for varchar.c is a fix for a nasty bug
of char(n) types that I introduced and I believe at least this should
be applied.
Tatsuo Ishii
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/libpq/fe-print.c | 14 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpqdll.def | 3 | ||||
| -rw-r--r-- | src/interfaces/libpq/win32.mak | 14 |
3 files changed, 27 insertions, 4 deletions
diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c index fc998d9458..a987f2039b 100644 --- a/src/interfaces/libpq/fe-print.c +++ b/src/interfaces/libpq/fe-print.c @@ -9,7 +9,7 @@ * didn't really belong there. * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.13 1998/10/04 20:46:39 tgl Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.14 1998/10/06 03:02:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -513,7 +513,17 @@ PQmblen(unsigned char *s) return (pg_encoding_mblen(encoding, s)); } -#endif +#else + +#ifdef WIN32 +int +PQmblen(unsigned char *s) +{ +} +#endif /* WIN32 */ + + +#endif /* MULTIBYTE */ static void do_field(PQprintOpt *po, PGresult *res, diff --git a/src/interfaces/libpq/libpqdll.def b/src/interfaces/libpq/libpqdll.def index a7c9b28ef8..ee8b638492 100644 --- a/src/interfaces/libpq/libpqdll.def +++ b/src/interfaces/libpq/libpqdll.def @@ -63,4 +63,5 @@ EXPORTS lo_unlink @ 60 lo_import @ 61 lo_export @ 62 - PQresultErrorMessage @ 63 + pgresStatus @ 63 + PQmblen @ 64 diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak index 71d57dc464..7260f977ab 100644 --- a/src/interfaces/libpq/win32.mak +++ b/src/interfaces/libpq/win32.mak @@ -33,7 +33,7 @@ CLEAN : -@erase "$(OUTDIR)\libpq.lib" -@erase "$(OUTDIR)\libpq.dll" -@erase "$(OUTDIR)\libpq.res" - -@erase "$(OUTDIR)\vc*.*" + -@erase "vc50.pch" -@erase "$(OUTDIR)\libpq.pch" -@erase "$(OUTDIR)\libpqdll.exp" -@erase "$(OUTDIR)\libpqdll.lib" @@ -44,6 +44,14 @@ CLEAN : CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D\ "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" /YX\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c + +!IFDEF MULTIBYTE +!IFNDEF MBFLAGS +MBFLAGS="-DMULTIBYTE=$(MULTIBYTE)" +!ENDIF +CPP_PROJ = $(CPP_PROJ) $(MBFLAGS) +!ENDIF + CPP_OBJS=.\Release/ CPP_SBRS=. @@ -58,6 +66,10 @@ LIB32_OBJS= \ "$(INTDIR)\fe-misc.obj" \ "$(INTDIR)\fe-print.obj" +!IFDEF MULTIBYTE +LIB32_OBJS = $(LIB32_OBJS) $(INTDIR)\common.obj $(INTDIR)\wchar.obj $(INTDIR)\conv.obj +!ENDIF + RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res" LINK32=link.exe |