diff options
Diffstat (limited to 'src/backend')
-rw-r--r-- | src/backend/Makefile | 7 | ||||
-rw-r--r-- | src/backend/catalog/genbki.sh | 4 | ||||
-rw-r--r-- | src/backend/parser/sysfunc.c | 5 | ||||
-rw-r--r-- | src/backend/storage/ipc.h | 3 | ||||
-rw-r--r-- | src/backend/utils/adt/float.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/nabstime.c | 3 |
6 files changed, 19 insertions, 7 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile index fbde3abee0c..aaaa6683370 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.2 1996/07/31 17:19:49 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.3 1996/08/19 13:51:55 scrappy Exp $ # #------------------------------------------------------------------------- @@ -118,6 +118,11 @@ ifeq ($(PORTNAME), linux) LDADD+= -lc endif +# the following is special for Reliant UNIX SVR4 (formerly SINIX) +ifeq ($(PORTNAME), svr4) +LDFLAGS+= -LD-Blargedynsym +endif + postgres: $(POSTGRES_DEPEND) $(OBJS) $(EXPORTS) $(CC) $(LDFLAGS) -o $(objdir)/$(@F) $(addprefix $(objdir)/,$(notdir $(OBJS))) $(LDADD) diff --git a/src/backend/catalog/genbki.sh b/src/backend/catalog/genbki.sh index 2f7e4025b83..d8f5d290254 100644 --- a/src/backend/catalog/genbki.sh +++ b/src/backend/catalog/genbki.sh @@ -10,7 +10,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh,v 1.1.1.1 1996/07/09 06:21:15 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh,v 1.2 1996/08/19 13:52:02 scrappy Exp $ # # NOTES # non-essential whitespace is removed from the generated file. @@ -62,7 +62,7 @@ sed -e 's/\/\*.*\*\///g' \ -e 's/\ NameData/\ name/g' \ -e 's/(NameData/(name/g' \ -e 's/(Oid/(oid/g' | \ -awk ' +gawk ' # ---------------- # now use awk to process remaining .h file.. # diff --git a/src/backend/parser/sysfunc.c b/src/backend/parser/sysfunc.c index c69ca1b5b06..5cc1935b7b0 100644 --- a/src/backend/parser/sysfunc.c +++ b/src/backend/parser/sysfunc.c @@ -30,8 +30,13 @@ char *Sysfunc_system_date(void) time(&cur_time_secs); cur_time_expanded = localtime(&cur_time_secs); +#if defined(EUROPEAN_DATES) || defined(EUROPEAN_STYLE) + sprintf(buf, "%02.2d-%02.2d-%04.4d", cur_time_expanded->tm_mday, + cur_time_expanded->tm_mon+1, cur_time_expanded->tm_year+1900); +#else sprintf(buf, "%02.2d-%02.2d-%04.4d", cur_time_expanded->tm_mon+1, cur_time_expanded->tm_mday, cur_time_expanded->tm_year+1900); +#endif return &buf[0]; } diff --git a/src/backend/storage/ipc.h b/src/backend/storage/ipc.h index 9dae6da5ffe..4dfe3fdf663 100644 --- a/src/backend/storage/ipc.h +++ b/src/backend/storage/ipc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: ipc.h,v 1.5 1996/08/04 21:03:23 scrappy Exp $ + * $Id: ipc.h,v 1.6 1996/08/19 13:52:20 scrappy Exp $ * * NOTES * This file is very architecture-specific. This stuff should actually @@ -125,6 +125,7 @@ extern int S_LOCK_FREE(slock_t *lock); defined(PORTNAME_i386_solaris) || \ defined(PORTNAME_sparc_solaris) || \ defined(PORTNAME_ultrix4) || \ + defined(PORTNAME_svr4) || \ defined(WIN32) union semun { int val; diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index f4b3bef5438..82caf28c8f4 100644 --- a/src/backend/utils/adt/float.c +++ b/src/backend/utils/adt/float.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.2 1996/07/20 08:36:17 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.3 1996/08/19 13:52:35 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -1275,7 +1275,7 @@ static int isinf(x) } #endif /* PORTNAME_alpha */ -#if defined(PORTNAME_sparc_solaris)||defined(PORTNAME_i386_solaris) +#if defined(PORTNAME_sparc_solaris)||defined(PORTNAME_i386_solaris) || defined(PORTNAME_svr4) #include <ieeefp.h> static int isinf(d) diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 3faa3a216f9..875aa1d82e1 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.3 1996/07/22 21:56:03 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.4 1996/08/19 13:52:40 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -296,6 +296,7 @@ tryabsdate(char *fields[], int nf, struct tm *tm, int *tzp) defined(PORTNAME_i386_solaris) || \ defined(PORTNAME_irix5) || \ defined(PORTNAME_sparc_solaris) || \ + defined(PORTNAME_svr4) || \ defined(WIN32) tzset(); #ifndef WIN32 |