I have committed following changes to both the current and the statble
tree. They should fix some problems when compiling libpq on Windows
with MB enabled, according to Hiroki Kataoka, the author of the
patches.
---
Tatsuo Ishii

----------------------------------------------------------------
diff -rc src.orig/interfaces/libpq/win32.mak src/interfaces/libpq/win32.mak
*** src.orig/interfaces/libpq/win32.mak	Tue Jun  8 16:00:37 1999
--- src/interfaces/libpq/win32.mak	Fri Jul 16 00:28:16 1999
***************
*** 37,42 ****
--- 37,48 ----
  	-@erase "$(OUTDIR)\libpq.pch"
  	-@erase "$(OUTDIR)\libpqdll.exp"
  	-@erase "$(OUTDIR)\libpqdll.lib"
+ !IFDEF MULTIBYTE
+ 	-@erase "$(INTDIR)\common.obj"
+ 	-@erase "$(INTDIR)\wchar.obj"
+ 	-@erase "$(INTDIR)\conv.obj"
+ 	-@erase "$(INTDIR)\big5.obj"
+ !ENDIF
  
  "$(OUTDIR)" :
      if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
***************
*** 67,73 ****
  	"$(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"
--- 73,79 ----
  	"$(INTDIR)\fe-print.obj"
  
  !IFDEF MULTIBYTE
! LIB32_OBJS = $(LIB32_OBJS) "$(INTDIR)\common.obj" "$(INTDIR)\wchar.obj" "$(INTDIR)\conv.obj" "$(INTDIR)\big5.obj"
  !ENDIF
  
  RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
***************
*** 103,110 ****
--- 109,139 ----
      $(CPP) @<<
      $(CPP_PROJ) ..\..\backend\lib\dllist.c
  <<
+ 
      
+ !IFDEF MULTIBYTE
+ "$(INTDIR)\common.obj" : ..\..\backend\utils\mb\common.c
+     $(CPP) @<<
+     $(CPP_PROJ) /I "." ..\..\backend\utils\mb\common.c
+ <<
  
+ "$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c
+     $(CPP) @<<
+     $(CPP_PROJ) /I "." ..\..\backend\utils\mb\wchar.c
+ <<
+ 
+ "$(INTDIR)\conv.obj" : ..\..\backend\utils\mb\conv.c
+     $(CPP) @<<
+     $(CPP_PROJ) /I "." ..\..\backend\utils\mb\conv.c
+ <<
+ 
+ "$(INTDIR)\big5.obj" : ..\..\backend\utils\mb\big5.c
+     $(CPP) @<<
+     $(CPP_PROJ) /I "." ..\..\backend\utils\mb\big5.c
+ <<
+ !ENDIF
+ 
+ 
  .c{$(CPP_OBJS)}.obj::
     $(CPP) @<<
     $(CPP_PROJ) $<



Mon, 16 Aug 1999 13:35:27 +0900
Tatsuo Ishii <t-ishii@sra.co.jp>
WIN32 + MB fix