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

Commitd2b7f51

Browse files
committed
>OK, if you look at the last few commits to interfaces/libpq/win32.mak,
>you will see changes for pg_config_paths.h and for thread safety. Can>you look at those changes, merge them into bcc.mak. There might be>other changes in there you want to add to bcc.mak too.>>>OK, having no M$ diff, I attach files src\interfaces\libpq\bcc32.mak andsrc\interfaces\libpq\win32.hSteve Holdoway
1 parentf951a46 commitd2b7f51

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

‎src/interfaces/libpq/bcc32.mak

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ LIB32_OBJS= \
6868
"$(INTDIR)\inet_aton.obj"\
6969
"$(INTDIR)\crypt.obj"\
7070
"$(INTDIR)\path.obj"\
71+
"$(INTDIR)\noblock.obj"\
72+
"$(INTDIR)\pgstrcasecmp.obj"\
7173
"$(INTDIR)\dllist.obj"\
7274
"$(INTDIR)\md5.obj"\
7375
"$(INTDIR)\ip.obj"\
@@ -84,6 +86,7 @@ LIB32_OBJS= \
8486
"$(INTDIR)\wchar.obj"\
8587
"$(INTDIR)\encnames.obj"
8688

89+
8790
RSC=brcc32.exe
8891
RSC_PROJ=-l 0x409 -i$(BCB)\include -fo"$(INTDIR)\libpq.res"
8992

@@ -98,7 +101,7 @@ LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
98101

99102
# ---------------------------------------------------------------------------
100103

101-
ALL: "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
104+
ALL:config"$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
102105

103106
CLEAN :
104107
-@erase"$(INTDIR)\getaddrinfo.obj"
@@ -123,12 +126,24 @@ CLEAN :
123126
-@erase"$(OUTDIR)\win32.obj"
124127
-@erase"$(INTDIR)\wchar.obj"
125128
-@erase"$(INTDIR)\encnames.obj"
129+
-@erase"$(INTDIR)\noblock.obj"
130+
-@erase"$(INTDIR)\pgstrcasecmp.obj"
126131
-@erase"$(OUTDIR)\libpq.res"
127132
-@erase"$(OUTDIR)\blibpq.lib"
128133
-@erase"$(OUTDIR)\blibpqdll.lib"
129134
-@erase"$(OUTDIR)\blibpq.dll"
130135
-@erase"$(OUTDIR)\blibpq.tds"
131136

137+
config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
138+
139+
..\..\include\pg_config.h: ..\..\include\pg_config.h.win32
140+
copy ..\..\include\pg_config.h.win32 ..\..\include\pg_config.h
141+
142+
pthread.h: pthread.h.win32
143+
copy pthread.h.win32 pthread.h
144+
145+
pg_config_paths.h: win32.mak
146+
echo#define SYSCONFDIR "" >pg_config_paths.h
132147

133148
"$(OUTDIR)" :
134149
@if not exist"$(OUTDIR)/$(NULL)" mkdir"$(OUTDIR)"
@@ -152,6 +167,7 @@ CLEAN :
152167
+-")"
153168
!
154169

170+
155171
.c.obj:
156172
$(CPP) -o"$(INTDIR)\$&"$(CPP_PROJ)$<
157173

‎src/interfaces/libpq/win32.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#define_timeb timeb
99
#define_ftime(a) ftime(a)
1010
#define_errno errno
11+
#definepopen(a,b) _popen(a,b)
1112
#else
1213
/* open provided elsewhere */
1314
#defineclose(a) _close(a)

0 commit comments

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