Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit fe91cd4

Browse files
committed
If we're going to offer a default definition of PQmblen,
it probably ought to actually work.
1 parent a4fd4cd commit fe91cd4

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

src/interfaces/libpq/fe-print.c

+3-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* didn't really belong there.
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.14 1998/10/06 03:02:25 momjian Exp $
12+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.15 1998/10/06 14:16:50 tgl Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -515,13 +515,12 @@ PQmblen(unsigned char *s)
515515

516516
#else
517517

518-
#ifdef WIN32
518+
/* Provide a default definition in case someone calls it anyway */
519519
int
520520
PQmblen(unsigned char *s)
521521
{
522+
return 1;
522523
}
523-
#endif /* WIN32 */
524-
525524

526525
#endif /* MULTIBYTE */
527526

src/interfaces/libpq/libpq-fe.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: libpq-fe.h,v 1.44 1998/10/01 01:40:23 tgl Exp $
9+
* $Id: libpq-fe.h,v 1.45 1998/10/06 14:16:49 tgl Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -283,9 +283,8 @@ extern "C"
283283
int width); /* width of column, if
284284
* 0, use variable width */
285285

286-
#ifdef MULTIBYTE
286+
/* Determine length of multibyte encoded char at *s */
287287
extern int PQmblen(unsigned char *s);
288-
#endif
289288

290289
/* === in fe-lobj.c === */
291290

0 commit comments

Comments
 (0)