diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1996-07-20 08:36:33 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1996-07-20 08:36:33 +0000 |
| commit | ffae4ebde91a894d381a4b7fa9671fe83f08db3f (patch) | |
| tree | 2eb30b450e9e749f0b6d95eb773a52b4a45ba2e7 /src/backend/storage | |
| parent | 544e802910357b54861def90375060b58a78c826 (diff) | |
| download | postgresql-ffae4ebde91a894d381a4b7fa9671fe83f08db3f.tar.gz | |
Brought in NEOSOFT's port to i386_solaris
Submitted by: Randy Kunkee <kunkee@Starbase.NeoSoft.COM>
Diffstat (limited to 'src/backend/storage')
| -rw-r--r-- | src/backend/storage/ipc.h | 7 | ||||
| -rw-r--r-- | src/backend/storage/ipc/ipc.c | 4 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/proc.c | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/backend/storage/ipc.h b/src/backend/storage/ipc.h index 0da041bc9c..36cb3c8f62 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.1.1.1 1996/07/09 06:21:52 scrappy Exp $ + * $Id: ipc.h,v 1.2 1996/07/20 08:35:24 scrappy Exp $ * * NOTES * This file is very architecture-specific. This stuff should actually @@ -30,14 +30,15 @@ * atomic test-and-set instruction). However, we have only written * spinlock code for the architectures listed. */ -#if defined(PORTNAME_aix) || \ +#if (defined(PORTNAME_aix) || \ defined(PORTNAME_alpha) || \ defined(PORTNAME_hpux) || \ defined(PORTNAME_irix5) || \ defined(PORTNAME_next) || \ defined(PORTNAME_sparc) || \ defined(PORTNAME_sparc_solaris) || \ - (defined(__i386__) && defined(__GNUC__)) + (defined(__i386__) && defined(__GNUC__))) && \ + !defined(PORTNAME_i386_solaris) #define HAS_TEST_AND_SET #endif diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index 306300b90c..0ccccd78fc 100644 --- a/src/backend/storage/ipc/ipc.c +++ b/src/backend/storage/ipc/ipc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.1.1.1 1996/07/09 06:21:54 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.2 1996/07/20 08:35:52 scrappy Exp $ * * NOTES * @@ -47,7 +47,7 @@ int UsePrivateMemory = 1; int UsePrivateMemory = 0; #endif -#if defined(PORTNAME_bsdi) +#if defined(PORTNAME_bsdi)||defined(PORTNAME_i386_solaris) /* hacka, hacka, hacka (XXX) */ union semun { int val; /* value for SETVAL */ diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 0955cdfc2f..10dad600b5 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.1.1.1 1996/07/09 06:21:57 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.2 1996/07/20 08:35:58 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -46,7 +46,7 @@ * This is so that we can support more backends. (system-wide semaphore * sets run out pretty fast.) -ay 4/95 * - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.1.1.1 1996/07/09 06:21:57 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.2 1996/07/20 08:35:58 scrappy Exp $ */ #include <sys/time.h> #ifndef WIN32 @@ -56,7 +56,7 @@ #include <sys/types.h> #include "libpq/pqsignal.h" /* substitute for <signal.h> */ -#if defined(PORTNAME_bsdi) +#if defined(PORTNAME_bsdi)||defined(PORTNAME_i386_solaris) /* hacka, hacka, hacka (XXX) */ union semun { int val; /* value for SETVAL */ |