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

Commit93f7225

Browse files
author
Bryan Henderson
committed
Whoops, redo Ultrix patch so the other ports still compile.
1 parentc118543 commit93f7225

File tree

11 files changed

+50
-22
lines changed

11 files changed

+50
-22
lines changed

‎src/bin/Makefile.global

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.11 1996/11/14 09:24:39 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.12 1996/11/26 07:37:54 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -27,8 +27,7 @@ endif
2727

2828
INCLUDE_OPT := \
2929
-I$(LIBPQDIR) \
30-
-I$(SRCDIR)/include \
31-
-I$(SRCDIR)/src/backend/port/$(PORTNAME)
30+
-I$(SRCDIR)/include
3231

3332
CFLAGS += $(INCLUDE_OPT)
3433

‎src/bin/pg_dump/Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,28 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.9 1996/11/2603:19:36 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.10 1996/11/2607:38:16 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ../..
1515
include ../Makefile.global
1616
include ../../Makefile.global
1717

18-
CFLAGS+= -I../../backend/port/${PORTNAME}
19-
2018
OBJS= pg_dump.o common.o
2119

20+
ifeq ($(PORTNAME), ultrix4)
21+
OBJS+= ../../utils/strdup.o
22+
endif
23+
2224
all: submake pg_dump
2325

2426
pg_dump:$(OBJS)$(LIBPQDIR)/libpq.a
2527
$(CC)$(LDFLAGS) -o pg_dump -L$(LIBPQDIR)$(OBJS) -lpq$(LD_ADD)
2628

29+
../../utils/strdup.o:
30+
$(MAKE) -C ../../utils/strdup.o
31+
2732
.PHONY: submake
2833
submake:
2934
$(MAKE) -C$(LIBPQDIR) libpq.a

‎src/bin/pg_dump/common.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.8 1996/11/2603:19:40 bryanh Exp $
10+
* $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.9 1996/11/2607:38:18 bryanh Exp $
1111
*
1212
* Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
1313
*
@@ -29,7 +29,9 @@
2929

3030
#include"postgres.h"
3131
#include"libpq-fe.h"
32-
#include<port-protos.h>/* for strdup() */
32+
#ifdefNEED_STRDUP
33+
#include"strdup.h"
34+
#endif
3335

3436
#include"pg_dump.h"
3537

‎src/bin/pg_dump/pg_dump.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*
2121
*
2222
* IDENTIFICATION
23-
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.17 1996/11/2603:19:45 bryanh Exp $
23+
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.18 1996/11/2607:38:19 bryanh Exp $
2424
*
2525
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
2626
*
@@ -54,7 +54,9 @@
5454
#include"postgres.h"
5555
#include"access/htup.h"
5656
#include"libpq-fe.h"
57-
#include<port-protos.h>/* for strdup() */
57+
#ifdefNEED_STRDUP
58+
#include"strdup.h"
59+
#endif
5860

5961
#include"pg_dump.h"
6062

‎src/bin/psql/Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.14 1996/11/2603:19:54 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.15 1996/11/2607:38:24 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -16,8 +16,7 @@ include ../../Makefile.global
1616

1717
INCLUDE_OPT:=\
1818
-I$(LIBPQDIR)\
19-
-I../../include\
20-
-I../../backend/port/$(PORTNAME)
19+
-I../../include
2120

2221
CFLAGS+=$(INCLUDE_OPT)
2322
#
@@ -63,11 +62,18 @@ ifneq ($(USE_READLINE), true)
6362
OBJS+= rlstubs.o
6463
endif
6564

65+
ifeq ($(PORTNAME), ultrix4)
66+
OBJS+= ../../utils/strdup.o
67+
endif
68+
6669
all: submake psql
6770

6871
psql:$(OBJS)$(LIBPQDIR)/libpq.a
6972
$(CC)$(LDFLAGS) -o psql -L$(LIBPQDIR)$(OBJS) -lpq$(LD_ADD)
7073

74+
../../utils/strdup.o:
75+
$(MAKE) -C ../../utils strdup.o
76+
7177
.PHONY: submake
7278
submake:
7379
$(MAKE) -C$(LIBPQDIR) libpq.a

‎src/bin/psql/psql.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.34 1996/11/2603:19:58 bryanh Exp $
10+
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.35 1996/11/2607:38:28 bryanh Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -24,7 +24,9 @@
2424
#include"libpq-fe.h"
2525
#include"stringutils.h"
2626
#include"psqlHelp.h"
27-
#include<port-protos.h>/* for strdup() */
27+
#ifdefNEED_STRDUP
28+
#include"strdup.h"
29+
#endif
2830

2931
#ifdefNOREADLINE
3032
#include"rlstubs.h"

‎src/bin/psql/stringutils.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.6 1996/11/2603:20:06 bryanh Exp $
10+
* $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.7 1996/11/2607:38:36 bryanh Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -16,7 +16,9 @@
1616
#include<ctype.h>
1717
#include<stdlib.h>
1818

19-
#include<port-protos.h>/* for strdup() */
19+
#ifdefNEED_STRDUP
20+
#include"strdup.h"
21+
#endif
2022

2123
#include"stringutils.h"
2224

‎src/include/config.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
# defineNEED_ISINF
4242
# define USE_POSIX_TIME
4343
# defineNEED_UNION_SEMUN
44+
# define NEED_STRDUP
4445
#endif
4546

4647
#if defined(linux)

‎src/interfaces/libpq/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.20 1996/11/2606:33:18 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.21 1996/11/2607:38:46 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ..
1515
include ../Makefile.global
1616

1717
# We need the backend directory here for its fmgr.h
18-
INCLUDE_OPT= -I../include -I../backend -I../backend/port/$(PORTNAME)
18+
INCLUDE_OPT= -I../include -I../backend
1919

2020
CFLAGS+=$(INCLUDE_OPT)
2121

‎src/interfaces/libpq/fe-connect.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.20 1996/11/2603:20:35 bryanh Exp $
10+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.21 1996/11/2607:38:55 bryanh Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -30,7 +30,9 @@
3030
#include"fe-auth.h"
3131
#include"libpq-fe.h"
3232

33-
#include<port-protos.h>/* for strdup() */
33+
#ifdefNEED_STRDUP
34+
#include"strdup.h"
35+
#endif
3436

3537
#if defined(ultrix4)|| defined(next)
3638
/* ultrix is lame and doesn't have strdup in libc for some reason */

‎src/utils/Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@
44
# Makefile for utils
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/utils/Attic/Makefile,v 1.2 1996/11/11 16:30:07 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/utils/Attic/Makefile,v 1.3 1996/11/26 07:39:11 bryanh Exp $
8+
#
9+
# About strdup: Some systems have strdup in their standard library, others
10+
# don't. Ones that don't will use this make file to compile the strdup.c
11+
# in this directory. (You don't see strdup mentioned because the implicit
12+
# rule does the job). We don't make strdup.o unless asked to explicitly
13+
# because the strdup.c in this directory may conflict with the strdup()
14+
# prototype from the system library and cause a compile error.
815
#
916
#-------------------------------------------------------------------------
1017

0 commit comments

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