summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-01 23:45:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:12 -0500
commit28785364baec1fbbf66de9ca38f397d7cc5c2c67 (patch)
treeab600b3f80da9641839682f87ef070e907d14a13 /source4/torture
parentf20f1f994ac375ab96cc8a38075b99aa20041b3f (diff)
downloadsamba-28785364baec1fbbf66de9ca38f397d7cc5c2c67.tar.gz
samba-28785364baec1fbbf66de9ca38f397d7cc5c2c67.tar.bz2
samba-28785364baec1fbbf66de9ca38f397d7cc5c2c67.zip
r3446: created include/system/iconv.h and include/system/shmem.h
(This used to be commit 70055fb1f499cd40e996e56c7ba9ef8d2267b421)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/local/iconv.c1
-rw-r--r--source4/torture/torture_util.c10
2 files changed, 2 insertions, 9 deletions
diff --git a/source4/torture/local/iconv.c b/source4/torture/local/iconv.c
index 2c2a9564bf..eeca81e470 100644
--- a/source4/torture/local/iconv.c
+++ b/source4/torture/local/iconv.c
@@ -22,6 +22,7 @@
*/
#include "includes.h"
+#include "system/iconv.h"
#if HAVE_NATIVE_ICONV
/*
diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c
index 8565a4d7d8..41e616b5be 100644
--- a/source4/torture/torture_util.c
+++ b/source4/torture/torture_util.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "libcli/raw/libcliraw.h"
+#include "system/shmem.h"
static struct timeval tp1,tp2;
@@ -167,15 +168,6 @@ void *shm_setup(int size)
int shmid;
void *ret;
-/* NetBSD doesn't have these */
-#ifndef SHM_R
-#define SHM_R 0400
-#endif
-
-#ifndef SHM_W
-#define SHM_W 0200
-#endif
-
shmid = shmget(IPC_PRIVATE, size, SHM_R | SHM_W);
if (shmid == -1) {
printf("can't get shared memory\n");