|
10 | 10 | * Portions Copyright (c) 1994, Regents of the University of California
|
11 | 11 | *
|
12 | 12 | * IDENTIFICATION
|
13 |
| - * $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.21 2003/10/13 22:47:15 momjian Exp $ |
| 13 | + * $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.22 2003/10/26 04:53:24 momjian Exp $ |
14 | 14 | *
|
15 | 15 | *-------------------------------------------------------------------------
|
16 | 16 | */
|
@@ -133,7 +133,7 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, uint32 size)
|
133 | 133 | on_shmem_exit(IpcMemoryDelete,Int32GetDatum(shmid));
|
134 | 134 |
|
135 | 135 | /* OK, should be able to attach to the segment */
|
136 |
| -#if defined(solaris)&& defined(__sparc__) |
| 136 | +#if defined(sun)&& defined(__sparc__) |
137 | 137 | /* use intimate shared memory on SPARC Solaris */
|
138 | 138 | memAddress=shmat(shmid,0,SHM_SHARE_MMU);
|
139 | 139 | #else
|
@@ -352,7 +352,7 @@ PGSharedMemoryAttach(IpcMemoryKey key, IpcMemoryId *shmid)
|
352 | 352 |
|
353 | 353 | hdr= (PGShmemHeader*)shmat(*shmid,
|
354 | 354 | UsedShmemSegAddr,
|
355 |
| -#if defined(solaris)&&defined(__sparc__) |
| 355 | +#if defined(sun)&&defined(__sparc__) |
356 | 356 | /* use intimate shared memory on Solaris */
|
357 | 357 | SHM_SHARE_MMU
|
358 | 358 | #else
|
|