diff options
| author | Tom Lane | 1998-10-06 14:16:50 +0000 |
|---|---|---|
| committer | Tom Lane | 1998-10-06 14:16:50 +0000 |
| commit | fe91cd41ea0ce4669b0a64f68a64387d473c9dbd (patch) | |
| tree | 3c8c5984687801a8e28d39e5160475383cdfb89d | |
| parent | a4fd4cdc0dca016a52e92ddaadb2c9b227ffb082 (diff) | |
If we're going to offer a default definition of PQmblen,
it probably ought to actually work.
| -rw-r--r-- | src/interfaces/libpq/fe-print.c | 7 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-fe.h | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c index a987f2039bf..08e111310ac 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.14 1998/10/06 03:02:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.15 1998/10/06 14:16:50 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -515,13 +515,12 @@ PQmblen(unsigned char *s) #else -#ifdef WIN32 +/* Provide a default definition in case someone calls it anyway */ int PQmblen(unsigned char *s) { + return 1; } -#endif /* WIN32 */ - #endif /* MULTIBYTE */ diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index 13ce50b873d..3f3628777a5 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-fe.h,v 1.44 1998/10/01 01:40:23 tgl Exp $ + * $Id: libpq-fe.h,v 1.45 1998/10/06 14:16:49 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -283,9 +283,8 @@ extern "C" int width); /* width of column, if * 0, use variable width */ -#ifdef MULTIBYTE + /* Determine length of multibyte encoded char at *s */ extern int PQmblen(unsigned char *s); -#endif /* === in fe-lobj.c === */ |