Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0b1b010

Browse files
committed
Fixes for Win32-client only compiles.
Hiroshi Saito
1 parent43e9bab commit0b1b010

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

‎src/bin/psql/win32.mak‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ REFDOCDIR= ../../../doc/src/sgml/ref
2929
CPP_PROJ=/nologo$(OPT) /W3 /GX /D "WIN32"$(DEBUGDEF) /D "_CONSOLE" /D\
3030
"_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c\
3131
/I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32\
32+
/I ..\pg_dump /I ..\..\backend\
3233
/D "HAVE_STRDUP" /D "FRONTEND"
3334

3435
CPP_OBJS=$(INTDIR)/
@@ -59,6 +60,8 @@ CLEAN :
5960
-@erase"$(INTDIR)\path.obj"
6061
-@erase"$(INTDIR)\pgstrcasecmp.obj"
6162
-@erase"$(INTDIR)\sprompt.obj"
63+
-@erase"$(INTDIR)\dumputils.obj"
64+
-@erase"$(INTDIR)\keywords.obj"
6265
-@erase"$(INTDIR)\*psql.pch"
6366
-@erase"$(OUTDIR)\psql.exe"
6467
-@erase"$(INTDIR)\..\..\port\pg_config_paths.h"
@@ -90,7 +93,9 @@ LINK32_OBJS= \
9093
"$(INTDIR)\getopt_long.obj"\
9194
"$(INTDIR)\path.obj"\
9295
"$(INTDIR)\pgstrcasecmp.obj"\
93-
"$(INTDIR)\sprompt.obj"
96+
"$(INTDIR)\sprompt.obj"\
97+
"$(INTDIR)\dumputils.obj"\
98+
"$(INTDIR)\keywords.obj"
9499

95100
!IFDEF DEBUG
96101
LINK32_OBJS=$(LINK32_OBJS) "..\..\interfaces\libpq\Debug\libpqddll.lib"
@@ -149,6 +154,16 @@ LINK32_OBJS= $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib"
149154
$(CPP_PROJ) ..\..\port\sprompt.c
150155
<<
151156

157+
"$(INTDIR)\dumputils.obj" : "$(INTDIR)" ..\pg_dump\dumputils.c
158+
$(CPP) @<<
159+
$(CPP_PROJ) ..\pg_dump\dumputils.c
160+
<<
161+
162+
"$(INTDIR)\keywords.obj" : "$(INTDIR)" ..\..\backend\parser\keywords.c
163+
$(CPP) @<<
164+
$(CPP_PROJ) ..\..\backend\parser\keywords.c
165+
<<
166+
152167
"sql_help.h" : create_help.pl
153168
$(PERL) create_help.pl $(REFDOCDIR) $@
154169

‎src/include/pg_config.h.win32‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#define ACCEPT_TYPE_ARG3 int
1414

1515
#define MAXPGPATH 1024
16+
#define MEMSET_LOOP_LIMIT 1024
1617

1718
#define INDEX_MAX_KEYS 32
1819

‎src/win32.mak‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/src/win32.mak,v 1.11 2006/02/12 06:11:50 momjian Exp $
1+
# $PostgreSQL: pgsql/src/win32.mak,v 1.12 2006/03/03 23:11:48 momjian Exp $
22

33
# Makefile for Microsoft Visual C++ 5.0 (or compat)
44
# Top-file makefile for Win32 parts of postgresql.
@@ -20,8 +20,6 @@ ALL:
2020
nmake /f win32.mak $(MAKEMACRO)
2121
cd ..\..\bin\pg_dump
2222
nmake /f win32.mak $(MAKEMACRO)
23-
cd ..\..\bin\scripts
24-
nmake /f win32.mak $(MAKEMACRO)
2523
cd ..\..\bin\pg_config
2624
nmake /f win32.mak $(MAKEMACRO)
2725
cd ..\..
@@ -34,8 +32,6 @@ CLEAN:
3432
nmake /f win32.mak CLEAN
3533
cd ..\..\bin\pg_dump
3634
nmake /f win32.mak CLEAN
37-
cd ..\..\bin\scripts
38-
nmake /f win32.mak CLEAN
3935
cd ..\..\bin\pg_config
4036
nmake /f win32.mak CLEAN
4137
cd ..\..

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp