4 files changed, 12 insertions, 63 deletions
diff --git a/src/interfaces/jdbc/example/Unicode.java b/src/interfaces/jdbc/example/Unicode.java
index aa8b3bf424b..7303ee7bc20 100644
--- a/src/interfaces/jdbc/example/Unicode.java
+++ b/src/interfaces/jdbc/example/Unicode.java
@@ -11,9 +11,8 @@ import java.util.*;
  *	   example.Unicode <url> <user> <password>
  *	where <url> must specify an existing database to which <user> and
  *	<password> give access and which has UNICODE as its encoding.
- *	(To create a database with UNICODE encoding, you need to compile
- *	postgres with "--enable-multibyte" and run createdb with the
- *	flag "-E UNICODE".)
+ *	(To create a database with UNICODE encoding, you need to run createdb
+ *	with the flag "-E UNICODE".)
  *
  *	This test only produces output on error.
  *
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 804360f07b8..47f0744a5a5 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.64 2002/07/27 20:10:05 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.65 2002/09/03 21:45:44 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -22,12 +22,9 @@ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconf
 
 OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
       pqexpbuffer.o dllist.o md5.o pqsignal.o fe-secure.o \
+      wchar.o encnames.o \
       $(filter inet_aton.o snprintf.o strerror.o, $(LIBOBJS))
 
-ifdef MULTIBYTE
-OBJS+= wchar.o encnames.o
-endif
-
 
 # Add libraries that libpq depends (or might depend) on into the
 # shared library link.  (The order in which you list them here doesn't
@@ -57,12 +54,8 @@ md5.c: $(backend_src)/libpq/md5.c
 inet_aton.c snprintf.c strerror.c: %.c : $(top_srcdir)/src/port/%.c
 	rm -f $@ && $(LN_S) $< .
 
-ifdef MULTIBYTE
-wchar.c : % : $(backend_src)/utils/mb/%
-	rm -f $@ && $(LN_S) $< .
-encnames.c : % : $(backend_src)/utils/mb/%
+encnames.c wchar.c : % : $(backend_src)/utils/mb/%
 	rm -f $@ && $(LN_S) $< .
-endif
 
 
 install: all installdirs install-lib
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 8bb52d8e306..83022f70bfa 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-int.h,v 1.55 2002/08/18 03:47:08 tgl Exp $
+ * $Id: libpq-int.h,v 1.56 2002/09/03 21:45:44 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -180,7 +180,6 @@ typedef enum
 {
 	SETENV_STATE_OPTION_SEND,	/* About to send an Environment Option */
 	SETENV_STATE_OPTION_WAIT,	/* Waiting for above send to complete  */
-	/* these next two are only used in MULTIBYTE mode */
 	SETENV_STATE_ENCODINGS_SEND,	/* About to send an "encodings" query */
 	SETENV_STATE_ENCODINGS_WAIT,	/* Waiting for query to complete	  */
 	SETENV_STATE_IDLE
diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index 766d33ce08a..5563c9e9a3b 100644
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -6,29 +6,6 @@
 
 !MESSAGE Building the Win32 static library...
 !MESSAGE
-!IF "$(CFG)" == ""
-CFG=Release
-!MESSAGE No configuration specified. Defaulting to Release.
-!MESSAGE
-!ELSE
-!MESSAGE Configuration "$(CFG)"
-!MESSAGE
-!ENDIF
-
-!IF "$(CFG)" != "Release" && "$(CFG)" != "MultibyteRelease"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f win32.mak CFG=[Release | MultibyteRelease ]
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Release" (Win32 Release DLL)
-!MESSAGE "MultibyteRelease" (Win32 Release DLL with Multibyte support)
-!MESSAGE
-!ERROR An invalid configuration was specified.
-!ENDIF
 
 !IFDEF DEBUG
 OPT=/Od
@@ -46,10 +23,6 @@ NULL=
 NULL=nul
 !ENDIF 
 
-!IF "$(CFG)" == "MultibyteRelease"
-MULTIBYTE=1
-!ENDIF
-
 CPP=cl.exe
 RSC=rc.exe
 
@@ -82,10 +55,8 @@ CLEAN :
 	-@erase "$(OUTDIR)\libpq.pch"
 	-@erase "$(OUTDIR)\libpqdll.exp"
 	-@erase "$(OUTDIR)\libpqdll.lib"
-!IFDEF MULTIBYTE
 	-@erase "$(INTDIR)\wchar.obj"
 	-@erase "$(INTDIR)\encnames.obj"
-!ENDIF
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -94,16 +65,9 @@ CPP_PROJ=/nologo /MD /W3 /GX $(OPT) /I "..\..\include" /D "FRONTEND" $(DEBUGDEF)
  "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" /YX\
  /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c  /D "HAVE_VSNPRINTF" /D "HAVE_STRDUP"
 
-!IFDEF MULTIBYTE
-!IFNDEF	MBFLAGS
-MBFLAGS="-DMULTIBYTE=$(MULTIBYTE)"
-!ENDIF
-CPP_PROJ = $(CPP_PROJ) $(MBFLAGS)
-!ENDIF
-
 CPP_OBJS=.\Release/
 CPP_SBRS=.
-	
+
 LIB32=link.exe -lib
 LIB32_FLAGS=$(LOPT) /nologo /out:"$(OUTDIR)\libpq.lib" 
 LIB32_OBJS= \
@@ -117,11 +81,9 @@ LIB32_OBJS= \
 	"$(INTDIR)\fe-misc.obj" \
 	"$(INTDIR)\fe-print.obj" \
 	"$(INTDIR)\fe-secure.obj" \
-	"$(INTDIR)\pqexpbuffer.obj"
-
-!IFDEF MULTIBYTE
-LIB32_OBJS = $(LIB32_OBJS) "$(INTDIR)\wchar.obj" "$(INTDIR)\encnames.obj"
-!ENDIF
+	"$(INTDIR)\pqexpbuffer.obj" \
+	"$(INTDIR)\wchar.obj" \
+	"$(INTDIR)\encnames.obj"
 
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
 
@@ -156,27 +118,23 @@ LINK32_OBJS= \
     $(CPP_PROJ) ..\..\backend\lib\dllist.c
 <<
 
-    
+
 "$(OUTDIR)\md5.obj" : ..\..\backend\libpq\md5.c
     $(CPP) @<<
     $(CPP_PROJ) ..\..\backend\libpq\md5.c
 <<
 
-    
-!IFDEF MULTIBYTE
+
 "$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c
     $(CPP) @<<
     $(CPP_PROJ) /I "." ..\..\backend\utils\mb\wchar.c
 <<
-!ENDIF
 
 
-!IFDEF MULTIBYTE
 "$(INTDIR)\encnames.obj" : ..\..\backend\utils\mb\encnames.c
     $(CPP) @<<
     $(CPP_PROJ) /I "." ..\..\backend\utils\mb\encnames.c
 <<
-!ENDIF
 
 
 .c{$(CPP_OBJS)}.obj::