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

Commitbb0fe9f

Browse files
committed
Move copydir.c from src/port to src/backend/storage/file
The previous commit to make copydir() interruptible preventedpostgres.exe from linking on MinGW and Cygwin, because on thoseplatforms libpgport_srv.a can't freely reference symbols definedby the backend. Since that code is already backend-specific anyway,just move the whole file into the backend rather than adding furtherkludges to deal with the symbols needed by CHECK_FOR_INTERRUPTS().This probably needs some further cleanup, but this commit just movesthe file as-is, which should hopefully be enough to turn thebuildfarm green again.
1 parent621cf14 commitbb0fe9f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

‎src/backend/storage/file/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
# Makefile for storage/file
55
#
66
# IDENTIFICATION
7-
# $PostgreSQL: pgsql/src/backend/storage/file/Makefile,v 1.13 2008/02/19 10:30:08 petere Exp $
7+
# $PostgreSQL: pgsql/src/backend/storage/file/Makefile,v 1.14 2010/07/02 17:03:30 rhaas Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
subdir = src/backend/storage/file
1212
top_builddir = ../../../..
1313
include$(top_builddir)/src/Makefile.global
1414

15-
OBJS = fd.o buffile.o
15+
OBJS = fd.o buffile.o copydir.o
1616

1717
include$(top_srcdir)/src/backend/common.mk
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*as a service.
1212
*
1313
* IDENTIFICATION
14-
* $PostgreSQL: pgsql/src/port/copydir.c,v 1.37 2010/07/01 20:12:40 rhaas Exp $
14+
* $PostgreSQL: pgsql/src/backend/storage/file/copydir.c,v 1.1 2010/07/02 17:03:30 rhaas Exp $
1515
*
1616
*-------------------------------------------------------------------------
1717
*/

‎src/port/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# OBJS adds additional object files that are always compiled.
2020
#
2121
# IDENTIFICATION
22-
# $PostgreSQL: pgsql/src/port/Makefile,v 1.38 2009/08/26 22:24:43 petere Exp $
22+
# $PostgreSQL: pgsql/src/port/Makefile,v 1.39 2010/07/02 17:03:30 rhaas Exp $
2323
#
2424
#-------------------------------------------------------------------------
2525

@@ -30,7 +30,7 @@ include $(top_builddir)/src/Makefile.global
3030
overrideCPPFLAGS := -I$(top_builddir)/src/port -DFRONTEND$(CPPFLAGS)
3131
LIBS +=$(PTHREAD_LIBS)
3232

33-
OBJS =$(LIBOBJS) chklocale.ocopydir.odirmod.o exec.o noblock.o path.o\
33+
OBJS =$(LIBOBJS) chklocale.o dirmod.o exec.o noblock.o path.o\
3434
pgsleep.o pgstrcasecmp.o qsort.o qsort_arg.o sprompt.o thread.o
3535
ifneq (,$(filter$(PORTNAME),cygwin win32))
3636
OBJS += pipe.o

0 commit comments

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