(__initstate): Correct types of parameters and return value. (__setstate): Likewise.

diff --git a/stdlib/random.c b/stdlib/random.c
index e2f40c1..6303548 100644 (file)
--- a/stdlib/random.c
+++ b/stdlib/random.c
@@ -199,17 +199,17 @@ weak_alias (__srandom, srand)
    Note: The first thing we do is save the current state, if any, just like
    setstate so that it doesn't matter when initstate is called.
    Returns a pointer to the old state.  */
-void *
+char *
 __initstate (seed, arg_state, n)
      unsigned int seed;
-     void *arg_state;
+     char *arg_state;
      size_t n;
 {
-  void *ostate;
+  char *ostate;
 
   __libc_lock_lock (lock);
 
-  ostate = (void *) &unsafe_state.state[-1];
+  ostate = (char *) &unsafe_state.state[-1];
 
   __initstate_r (seed, arg_state, n, &unsafe_state);
 
@@ -228,15 +228,15 @@ weak_alias (__initstate, initstate)
    to the order in which things are done, it is OK to call setstate with the
    same state as the current state
    Returns a pointer to the old state information.  */
-void *
+char *
 __setstate (arg_state)
-     void *arg_state;
+     char *arg_state;
 {
-  void *ostate;
+  char *ostate;
 
   __libc_lock_lock (lock);
 
-  ostate = (void *) &unsafe_state.state[-1];
+  ostate = (char *) &unsafe_state.state[-1];
 
   if (__setstate_r (arg_state, &unsafe_state) < 0)
     ostate = NULL;

diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index db624de..8829106 100644 (file)
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -32,6 +32,11 @@
 #endif
 #include <stddef.h>
 
+__BEGIN_DECLS
+
+#ifndef __need_malloc_and_calloc
+#define        _STDLIB_H       1
+
 #ifdef __USE_XOPEN
 /* XPG requires a few symbols from <sys/wait.h> being defined.  */
 # include <bits/waitflags.h>
@@ -87,11 +92,6 @@ typedef union
 # endif
 #endif
 
-__BEGIN_DECLS
-
-#ifndef __need_malloc_and_calloc
-#define        _STDLIB_H       1
-
 /* Returned by `div'.  */
 typedef struct
   {