Index: stable/9/lib/libc/gen/jrand48.c
===================================================================
--- stable/9/lib/libc/gen/jrand48.c	(revision 310320)
+++ stable/9/lib/libc/gen/jrand48.c	(revision 310321)
@@ -1,24 +1,27 @@
 /*
  * Copyright (c) 1993 Martin Birgmeier
  * All rights reserved.
  *
  * You may redistribute unmodified or modified versions of this source
  * code provided that the above copyright notice and this and the
  * following conditions are retained.
  *
  * This software is provided ``as is'', and comes with no warranties
  * of any kind. I shall in no event be liable for anything that happens
  * to anyone/anything when using this software.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <stdint.h>
+
 #include "rand48.h"
 
 long
 jrand48(unsigned short xseed[3])
 {
+
 	_dorand48(xseed);
-	return ((long) xseed[2] << 16) + (long) xseed[1];
+	return ((int32_t)(((uint32_t)xseed[2] << 16) | (uint32_t)xseed[1]));
 }
Index: stable/9/lib/libc/gen/mrand48.c
===================================================================
--- stable/9/lib/libc/gen/mrand48.c	(revision 310320)
+++ stable/9/lib/libc/gen/mrand48.c	(revision 310321)
@@ -1,26 +1,30 @@
 /*
  * Copyright (c) 1993 Martin Birgmeier
  * All rights reserved.
  *
  * You may redistribute unmodified or modified versions of this source
  * code provided that the above copyright notice and this and the
  * following conditions are retained.
  *
  * This software is provided ``as is'', and comes with no warranties
  * of any kind. I shall in no event be liable for anything that happens
  * to anyone/anything when using this software.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <stdint.h>
+
 #include "rand48.h"
 
 extern unsigned short _rand48_seed[3];
 
 long
 mrand48(void)
 {
+
 	_dorand48(_rand48_seed);
-	return ((long) _rand48_seed[2] << 16) + (long) _rand48_seed[1];
+	return ((int32_t)(((uint32_t)_rand48_seed[2] << 16) |
+	    (uint32_t)_rand48_seed[1]));
 }
Index: stable/9/lib/libc
===================================================================
--- stable/9/lib/libc	(revision 310320)
+++ stable/9/lib/libc	(revision 310321)

Property changes on: stable/9/lib/libc
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/lib/libc:r309650