From d6dfbecb07bf6dbbcef5bcc9b917163cec97ca33 Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Tue, 8 Oct 1996 00:09:05 +0000 Subject: [PATCH] Moved the following definitions to include/config.h from Makefile.global: NAMEDATALEN OIDDATALEN EUROPEAN_DATES HBA DEADLOCK_TIMEOUT OPENLINK_PATCHES NULL_PATCH ARRAY_PATCH Attempting to document and centralize as many of the "defines" as possible... kinda useless to have defines if nobody knows they exist, eh? --- src/Makefile.global | 46 +--------------------------------------------- src/include/config.h | 46 ++++++++++++++++++++++++++++++++++------------ 2 files changed, 35 insertions(+), 57 deletions(-) diff --git a/src/Makefile.global b/src/Makefile.global index 99aa95cab7..853c71ee1b 100644 --- a/src/Makefile.global +++ b/src/Makefile.global @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.35 1996/09/23 18:17:42 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.36 1996/10/08 00:08:56 scrappy Exp $ # # NOTES # This is seen by any Makefiles that include mk/postgres.mk. To @@ -107,22 +107,6 @@ HEADERDIR= $(POSTGRESDIR)/include # The port to run the postmaster on POSTPORT= 5432 -# NAMEDATALEN is the max length for system identifiers (e.g. table names, -# attribute names, function names, etc.) -# -# These MUST be set here. DO NOT COMMENT THESE OUT -# Setting these too high will result in excess space usage for system catalogs -# Setting them too low will make the system unusable. -# values between 16 and 64 that are multiples of four are recommended. -# -# NOTE also that databases with different NAMEDATALEN's cannot interoperate! -# -NAMEDATALEN = 32 -# OIDNAMELEN should be set to NAMEDATALEN + sizeof(Oid) -OIDNAMELEN = 36 - -CFLAGS+= -DNAMEDATALEN=$(NAMEDATALEN) -DOIDNAMELEN=$(OIDNAMELEN) - ############################################################################## # # FEATURES @@ -139,11 +123,6 @@ CDEBUG= -O # multi-byte types to generate a bus error. ENFORCE_ALIGNMENT= true -# turn this on if you prefer European style dates instead of American -# style dates -#EUROPEAN_DATES = true - -# Comment out PROFILE to disable profiling. # # XXX define on MIPS if you want to be able to use pixie. # note that this disables dynamic loading! @@ -167,14 +146,6 @@ READLINE_LIB= -L/home/tools/lib -lreadline #HISTORY_INC= -I/home/tools/include -I/home/tools/include/readline #HISTORY_LIB= -L/home/tools/lib -lhistory -# If you do not plan to use Host based authentication, -# comment out the following line -HBA = 1 - -ifdef HBA -HBAFLAGS= -DHBA -endif - # If you plan to use Kerberos for authentication... # # Comment out KRBVERS if you do not use Kerberos. @@ -288,26 +259,11 @@ CFLAGS+= $(CFLAGS_BE) LDADD+= $(LDADD_BE) LDFLAGS+= $(LDFLAGS_BE) -# enable patches to array update code (moved to config.h) -#CFLAGS += -DARRAY_PATCH -# enable patches to null insert/update code -CFLAGS += -DNULL_PATCH -# enable patches for varchar and fsync -CFLAGS += -DOPENLINK_PATCHES - ############################################################################## # # Miscellaneous configuration # -# This is the time, in seconds, at which a given backend server -# will wait on a lock before deciding to abort the transaction -# (this is what we do in lieu of deadlock detection). -# -# Low numbers are not recommended as they will tend to cause -# false aborts if many transactions are long-lived. -CFLAGS+= -DDEADLOCK_TIMEOUT=60 - srcdir= $(SRCDIR) includedir= $(HEADERDIR) objdir= obj diff --git a/src/include/config.h b/src/include/config.h index a81d64e620..0a9ae57be0 100644 --- a/src/include/config.h +++ b/src/include/config.h @@ -1,4 +1,3 @@ - /* the purpose of this file is to reduce the use of #ifdef's through * the code base by those porting the software, an dto facilitate the * eventual use of autoconf to build the server @@ -39,26 +38,37 @@ * because it is used in both the prototypes as well as the definitions. * Note also the long name. We expect that this won't collide with * other names causing compiler warnings. -*/ + */ #ifndef SIGNAL_ARGS #define SIGNAL_ARGS int postgres_signal_arg #endif -# NAMEDATALEN is the max length for system identifiers (e.g. table names, -# attribute names, function names, etc.) -# -# These MUST be set here. DO NOT COMMENT THESE OUT -# Setting these too high will result in excess space usage for system catalogs -# Setting them too low will make the system unusable. -# values between 16 and 64 that are multiples of four are recommended. -# -# NOTE also that databases with different NAMEDATALEN's cannot interoperate! -# +/* NAMEDATALEN is the max length for system identifiers (e.g. table names, + * attribute names, function names, etc.) + * + * These MUST be set here. DO NOT COMMENT THESE OUT + * Setting these too high will result in excess space usage for system catalogs + * Setting them too low will make the system unusable. + * values between 16 and 64 that are multiples of four are recommended. + * + * NOTE also that databases with different NAMEDATALEN's cannot interoperate! + */ #define NAMEDATALEN 32 # OIDNAMELEN should be set to NAMEDATALEN + sizeof(Oid) #define OIDNAMELEN 36 +/* turn this on if you prefer European style dates instead of American + * style dates + */ +#define EUROPEAN_DATES FALSE + +/* + * If you do not plan to use Host based authentication, + * comment out the following line + */ +#define HBA + /* * On architectures for which we have not implemented spinlocks (or * cannot do so), we use System V semaphores. We also use them for @@ -87,6 +97,18 @@ /* #define LOARRAY */ #define ESCAPE_PATCH #define ARRAY_PATCH +#define NULL_PATCH +#define OPENLINK_PATCHES + +/* This is the time, in seconds, at which a given backend server + * will wait on a lock before deciding to abort the transaction + * (this is what we do in lieu of deadlock detection). + * + * Low numbers are not recommended as they will tend to cause + * false aborts if many transactions are long-lived. + */ +#define DEADLOCK_TIMEOUT 60 + /* Fixes use of indexes infunctions */ #define INDEXSCAN_PATCH -- 2.11.0