If we're going to offer a default definition of PQmblen,

it probably ought to actually work.

diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c
index a987f2039bf1e2813e973973fcb0de500ae7433c..08e111310acc97eb57a6671f2e5e9dcf7b30e989 100644 (file)
--- 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 13ce50b873d18655b38ce4e7a606ec81be5e4054..3f3628777a5a338996ff9e2449f2599a4b3326ad 100644 (file)
--- 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 === */