Index: source/include/includes.h
===================================================================
--- source/include/includes.h	16 Nov 2004 03:03:28 -0000	1.1.1.8
+++ source/include/includes.h	13 Dec 2004 09:17:19 -0000	1.2
@@ -1202,15 +1202,6 @@ int vasprintf(char **ptr, const char *fo
 #define LOG_DEBUG       7       /* debug-level messages */
 #endif
 
-/* NetBSD doesn't have these */
-#ifndef SHM_R
-#define SHM_R 0400
-#endif
-
-#ifndef SHM_W
-#define SHM_W 0200
-#endif
-
 #if HAVE_KERNEL_SHARE_MODES
 #ifndef LOCK_MAND 
 #define LOCK_MAND	32	/* This is a mandatory flock */
Index: source/profile/profile.c
===================================================================
--- source/profile/profile.c	20 Jul 2004 16:28:14 -0000	1.1.1.2
+++ source/profile/profile.c	26 Jul 2004 13:06:33 -0000	1.3
@@ -22,7 +22,7 @@
 #include "includes.h"
 
 #ifdef WITH_PROFILE
-#define IPC_PERMS ((SHM_R | SHM_W) | (SHM_R>>3) | (SHM_R>>6))
+#define IPC_PERMS ((S_IRUSR | S_IWUSR) | S_IRGRP | S_IROTH)
 #endif /* WITH_PROFILE */
 
 #ifdef WITH_PROFILE
Index: source/torture/torture.c
===================================================================
--- source/torture/torture.c	6 Aug 2004 21:38:22 -0000	1.1.1.4
+++ source/torture/torture.c	13 Dec 2004 09:16:51 -0000	1.2
@@ -70,7 +70,7 @@ void *shm_setup(int size)
 	int shmid;
 	void *ret;
 
-	shmid = shmget(IPC_PRIVATE, size, SHM_R | SHM_W);
+	shmid = shmget(IPC_PRIVATE, size, S_IRUSR | S_IWUSR);
 	if (shmid == -1) {
 		printf("can't get shared memory\n");
 		exit(1);