From 1359195c505df8af49b31460ec21e4e007f462c2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 14 Jan 2000 08:33:20 +0000
Subject: casts and defines to make solaris happy (This used to be commit
 77cf152c02b445f4b6e9de393936dd6e54e6f442)

---
 source3/tdb/tdb.c       | 4 ++++
 source3/utils/nbio.c    | 2 +-
 source3/utils/torture.c | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/tdb/tdb.c b/source3/tdb/tdb.c
index 9a598b9980..c5522bbf4b 100644
--- a/source3/tdb/tdb.c
+++ b/source3/tdb/tdb.c
@@ -54,6 +54,10 @@
 
 #define BUCKET(hash) ((hash) % tdb->header.hash_size)
 
+#ifndef MAP_FILE
+#define MAP_FILE 0
+#endif
+
 /* the body of the database is made of one list_struct for the free space
    plus a separate data list for each hash value */
 struct list_struct {
diff --git a/source3/utils/nbio.c b/source3/utils/nbio.c
index 71ac959f11..f72be36842 100644
--- a/source3/utils/nbio.c
+++ b/source3/utils/nbio.c
@@ -42,7 +42,7 @@ static void sigsegv(int sig)
 	char line[200];
 	printf("segv at line %d\n", line_count);
 	slprintf(line, sizeof(line), "/usr/X11R6/bin/xterm -e gdb /proc/%d/exe %d", 
-		getpid(), getpid());
+		(int)getpid(), (int)getpid());
 	system(line);
 	exit(1);
 }
diff --git a/source3/utils/torture.c b/source3/utils/torture.c
index 4539f11a6a..fb4367283c 100644
--- a/source3/utils/torture.c
+++ b/source3/utils/torture.c
@@ -1416,7 +1416,7 @@ static void run_dirtest(int dummy)
 	srandom(0);
 	for (i=0;i<numops;i++) {
 		fstring fname;
-		slprintf(fname, sizeof(fname), "%x", random());
+		slprintf(fname, sizeof(fname), "%x", (int)random());
 		fnum = cli_open(&cli, fname, O_RDWR|O_CREAT, DENY_NONE);
 		if (fnum == -1) {
 			fprintf(stderr,"Failed to open %s\n", fname);
@@ -1436,7 +1436,7 @@ static void run_dirtest(int dummy)
 	srandom(0);
 	for (i=0;i<numops;i++) {
 		fstring fname;
-		slprintf(fname, sizeof(fname), "%x", random());
+		slprintf(fname, sizeof(fname), "%x", (int)random());
 		cli_unlink(&cli, fname);
 	}
 
-- 
cgit