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

Commitcb6cb77

Browse files
committed
Here's the final set of patches to 6.0 (sup'd on 27/12/96) that allow a full
gmake of the code without interruption.There's also some tidy-up of the MAXPATHLEN stuff based on the assumption thatall supported platforms have MAXPATHLEN defined in <sys/param.h>.(The only unknowns for the above are AIX and IRIX5.)
1 parenta2b7f62 commitcb6cb77

File tree

8 files changed

+31
-29
lines changed

8 files changed

+31
-29
lines changed

‎src/Makefile.global

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.78 1996/12/26 17:39:58 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.79 1996/12/28 02:11:37 momjian Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -516,6 +516,7 @@ INSTALL= /usr/ucb/install
516516
# accessing headers in the backend directory.
517517
CFLAGS_BE= -I$(SRCDIR)/backend/port/sparc_solaris
518518
LDADD_BE= -lsocket -lnsl -ll -ldl
519+
LD_ADD= -lsocket -lnsl
519520

520521
ifeq ($(CC), cc)
521522
CFLAGS_SL= -K PIC
@@ -610,6 +611,7 @@ ifeq ($(PORTNAME), sparc_solaris)
610611
CC= gcc
611612

612613
LDADD_BE= -lsocket -lnsl -ll -ldl
614+
LD_ADD= -lsocket -lnsl
613615

614616
# RANLIB is not used on solaris
615617
RANLIB= touch

‎src/backend/port/sparc_solaris/port-protos.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,18 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: port-protos.h,v 1.2 1996/11/27 08:15:23 bryanh Exp $
9+
* $Id: port-protos.h,v 1.3 1996/12/28 02:11:49 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefPORT_PROTOS_H
1414
#definePORT_PROTOS_H
1515

16+
#include<netinet/in.h>/* For struct in_addr */
17+
#include<arpa/inet.h>
18+
1619
#include<dlfcn.h>
1720

18-
#include"config.h"/* For MAXPATHLEN */
1921
#include"fmgr.h"/* for func_ptr */
2022
#include"utils/dynamic_loader.h"
2123

‎src/backend/postmaster/Makefile

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for postmaster
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.3 1996/11/09 06:20:48 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.4 1996/12/28 02:12:04 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -17,6 +17,17 @@ INCLUDE_OPT = -I.. \
1717

1818
CFLAGS+=$(INCLUDE_OPT)
1919

20+
ifeq ($(PORTNAME), sparc_solaris)
21+
22+
ifeq ($(CC), gcc)
23+
# Until we figure out how to get rid of the warnings in this directory,
24+
# we must turn off any -Werror that is in CFLAGS now. These options only
25+
# exist for the gcc compiler.
26+
CFLAGS+= -Wno-error
27+
endif
28+
29+
endif
30+
2031
OBJS = postmaster.o
2132

2233
all: SUBSYS.o

‎src/backend/utils/adt/numutils.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.7 1996/11/27 08:15:54 bryanh Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.8 1996/12/28 02:12:17 momjian Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -156,9 +156,9 @@ ftoa(double value, char *ascii, int width, int prec1, char format)
156156
#else
157157
autointexpon;
158158
autointsign;
159-
registerintavail;
160-
registerchar*a;
161-
registerchar*p;
159+
registerintavail=0;
160+
registerchar*a=NULL;
161+
registerchar*p=NULL;
162162
charmode;
163163
intlowercase;
164164
intprec;

‎src/bin/psql/psql.c

Lines changed: 2 additions & 1 deletion
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.42 1996/12/26 22:07:57 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.43 1996/12/28 02:12:31 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -16,6 +16,7 @@
1616
#include<signal.h>
1717
#include<errno.h>
1818
#include<sys/types.h>
19+
#include<sys/param.h>/* for MAXPATHLEN */
1920
#include<sys/stat.h>
2021
#include<unistd.h>
2122
#include<fcntl.h>

‎src/include/config.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@
88

99
#defineBLCKSZ8192
1010

11-
/* Found in catalog/catalog.c, but doesn't seem to do anything in there */
12-
#if !defined(sparc_solaris)
13-
#ifndefMAXPATHLEN
14-
#defineMAXPATHLEN 80
15-
#endif
16-
#endif/* !defined(sparc_solaris) */
17-
1811
#if defined(aix)
1912
#defineTERMIOS_H_LOCATION <termios.h>
2013
#else
@@ -200,6 +193,9 @@ typedef unsigned char slock_t;
200193
# defineHAVE_TZSET
201194
# defineNEED_CBRT
202195
# defineNEED_ISINF
196+
# ifndefMAXPATHLEN
197+
# defineMAXPATHLEN 250
198+
# endif
203199
#endif/* WIN32 */
204200

205201
#if defined(ultrix4)

‎src/include/utils/dynamic_loader.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: dynamic_loader.h,v 1.3 1996/11/26 03:20:17 bryanh Exp $
9+
* $Id: dynamic_loader.h,v 1.4 1996/12/28 02:12:51 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefDYNAMIC_LOADER_H
1414
#defineDYNAMIC_LOADER_H
1515

1616
#include<sys/types.h>
17+
#include<sys/param.h>/* For MAXPATHLEN */
1718

1819
#include<postgres.h>
1920

@@ -22,13 +23,6 @@
2223
#undef MAX
2324
#endif/* MIN */
2425

25-
#ifdefWIN32
26-
#defineMAXPATHLEN 250
27-
#endif
28-
29-
#ifdefWIN32
30-
#endif
31-
3226
/*
3327
* List of dynamically loaded files.
3428
*/

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

Lines changed: 1 addition & 5 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-lobj.c,v 1.5 1996/11/16 05:18:58 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.6 1996/12/28 02:13:05 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -21,10 +21,6 @@
2121
#include"libpq-fe.h"
2222
#include"libpq/libpq-fs.h"
2323

24-
#ifndefMAXPATHLEN
25-
#defineMAXPATHLEN 1024
26-
#endif
27-
2824
#defineLO_BUFSIZE 1024
2925

3026
staticintlo_initialize(PGconn*conn);

0 commit comments

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