Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f64b840

Browse files
author
Bryan Henderson
committed
Remove most compile-time options, add a few runtime options to make up for it.
In particular, no more compiled-in default for PGDATA or LIBDIR. Commands that need them need either invocation options or environment variables. PGPORT default is hardcoded as 5432, but overrideable with options or environment variables.
1 parent 7ac541d commit f64b840

File tree

25 files changed

+1959
-1924
lines changed

25 files changed

+1959
-1924
lines changed

src/backend/bootstrap/bootstrap.c

Lines changed: 412 additions & 398 deletions
Large diffs are not rendered by default.

src/backend/libpq/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for libpq subsystem (backend half of libpq interface)
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.3 1996/11/06 08:48:21 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.4 1996/11/14 10:23:51 bryanh Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -16,7 +16,6 @@ INCLUDE_OPT = -I.. \
1616
-I../../include
1717

1818
CFLAGS+=$(INCLUDE_OPT)
19-
CFLAGS+= -DPOSTPORT='"$(POSTPORT)"'
2019

2120
# kerberos flags
2221
ifdef KRBVERS

src/backend/libpq/pqcomm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.6 1996/11/08 05:56:21 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.7 1996/11/14 10:23:53 bryanh Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -140,7 +140,7 @@ pq_getport()
140140

141141
if (envport)
142142
return(atoi(envport));
143-
return(atoi(POSTPORT));
143+
return(atoi(DEF_PGPORT));
144144
}
145145

146146
/* --------------------------------

src/backend/port/win32/nt.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ struct sembuf
3030

3131
#define MAXHOSTNAMELEN 12 /* where is the official definition of this? */
3232
#define MAXPATHLEN _MAX_PATH /* in winsock.h */
33-
#define POSTPORT "5432"
3433

3534
/* NT has stricmp not strcasecmp. Which is ANSI? */
3635
#define strcasecmp(a,b) _stricmp(a,b)
@@ -46,5 +45,3 @@ struct sembuf
4645
#define GETNCNT 5
4746
#define GETVAL 6
4847

49-
#define POSTGRESDIR "d:\\pglite"
50-
#define PGDATADIR "d:\\pglite\\data"

0 commit comments

Comments
 (0)