Commit535d928

Hiroshi Inoue

committed

Remove compile errors of psql.exe and libpq.dll under

Multibyte mode.

1 parented19b91 commit535d928Copy full SHA for 535d928

File tree

+19

-1

lines changed

+19

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ CLEAN :`
`32`	`32`	`-@erase"$(INTDIR)\describe.obj"`
`33`	`33`	`-@erase"$(INTDIR)\tab-complete.obj"`
`34`	`34`	`-@erase"$(INTDIR)\getopt.obj"`
	`35`	`+-@erase"$(INTDIR)\mbprint.obj"`
`35`	`36`	`-@erase"$(INTDIR)\vc50.idb"`
`36`	`37`	`-@erase"$(OUTDIR)\psql.exe"`
`37`	`38`
`@@ -73,6 +74,7 @@ LINK32_OBJS= \`
`73`	`74`	`"$(INTDIR)\describe.obj"\`
`74`	`75`	`"$(INTDIR)\tab-complete.obj"\`
`75`	`76`	`"$(INTDIR)\getopt.obj"\`
	`77`	`+"$(INTDIR)\mbprint.obj"\`
`76`	`78`	`"..\..\interfaces\libpq\Release\libpqdll.lib"`
`77`	`79`
`78`	`80`	`"$(OUTDIR)\psql.exe" : "$(OUTDIR)"$(DEF_FILE)$(LINK32_OBJS)`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#ifndefpg_config_h_win32__`
	`2`	`+#definepg_config_h_win32__`
`1`	`3`	`/*`
`2`	`4`	`* Parts of pg_config.h that you get with autoconf on other systems`
`3`	`5`	`*/`
`@@ -23,3 +25,8 @@`
`23`	`25`
`24`	`26`	`#define HAVE_CXX_STRING_HEADER`
`25`	`27`	`#define HAVE_NAMESPACE_STD`
	`28`	`+`
	`29`	`+/* use _snprintf instead of snprintf */`
	`30`	`+#defineHAVE_SNPRINTF_DECL`
	`31`	`+#define snprintf_snprintf`
	`32`	`+#endif /* pg_config_h_win32__ */`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ CLEAN :`
`73`	`73`	`-@erase"$(OUTDIR)\libpqdll.lib"`
`74`	`74`	`!IFDEF MULTIBYTE`
`75`	`75`	`-@erase "$(INTDIR)\wchar.obj"`
	`76`	`+-@erase "$(INTDIR)\encnames.obj"`
`76`	`77`	`!ENDIF`
`77`	`78`
`78`	`79`	`"$(OUTDIR)" :`
`@@ -106,7 +107,7 @@ LIB32_OBJS= \`
`106`	`107`	`"$(INTDIR)\pqexpbuffer.obj"`
`107`	`108`
`108`	`109`	`!IFDEF MULTIBYTE`
`109`		`-LIB32_OBJS =$(LIB32_OBJS) "$(INTDIR)\wchar.obj"`
	`110`	`+LIB32_OBJS =$(LIB32_OBJS) "$(INTDIR)\wchar.obj" "$(INTDIR)\encnames.obj"`
`110`	`111`	`!ENDIF`
`111`	`112`
`112`	`113`	`RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"`
`@@ -158,6 +159,14 @@ LINK32_OBJS= \`
`158`	`159`	`!ENDIF`
`159`	`160`
`160`	`161`
	`162`	`+!IFDEF MULTIBYTE`
	`163`	`+"$(INTDIR)\encnames.obj" : ..\..\backend\utils\mb\encnames.c`
	`164`	`+ $(CPP) @<<`
	`165`	`+ $(CPP_PROJ) /I "." ..\..\backend\utils\mb\encnames.c`
	`166`	`+<<`
	`167`	`+!ENDIF`
	`168`	`+`
	`169`	`+`
`161`	`170`	`.c{$(CPP_OBJS)}.obj::`
`162`	`171`	`$(CPP) @<<`
`163`	`172`	`$(CPP_PROJ) $<`

Comments

(0)