Commit 15f98a3e authored by Bruce Momjian's avatar Bruce Momjian

Test for 'sun' rather than 'solaris' for intimate shared memory.

parent 3c9a32d4
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.21 2003/10/13 22:47:15 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.22 2003/10/26 04:53:24 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -133,7 +133,7 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, uint32 size) ...@@ -133,7 +133,7 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, uint32 size)
on_shmem_exit(IpcMemoryDelete, Int32GetDatum(shmid)); on_shmem_exit(IpcMemoryDelete, Int32GetDatum(shmid));
/* OK, should be able to attach to the segment */ /* OK, should be able to attach to the segment */
#if defined(solaris) && defined(__sparc__) #if defined(sun) && defined(__sparc__)
/* use intimate shared memory on SPARC Solaris */ /* use intimate shared memory on SPARC Solaris */
memAddress = shmat(shmid, 0, SHM_SHARE_MMU); memAddress = shmat(shmid, 0, SHM_SHARE_MMU);
#else #else
...@@ -352,7 +352,7 @@ PGSharedMemoryAttach(IpcMemoryKey key, IpcMemoryId *shmid) ...@@ -352,7 +352,7 @@ PGSharedMemoryAttach(IpcMemoryKey key, IpcMemoryId *shmid)
hdr = (PGShmemHeader *) shmat(*shmid, hdr = (PGShmemHeader *) shmat(*shmid,
UsedShmemSegAddr, UsedShmemSegAddr,
#if defined(solaris) && defined(__sparc__) #if defined(sun) && defined(__sparc__)
/* use intimate shared memory on Solaris */ /* use intimate shared memory on Solaris */
SHM_SHARE_MMU SHM_SHARE_MMU
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment