replace "scm_*_t" with "scm_t_*".

1 files changed, 20 insertions, 20 deletions

diff --git a/libguile/random.c b/libguile/random.c
index b41db73b2..a55d68c31 100644
--- a/libguile/random.c
+++ b/libguile/random.c
@@ -73,7 +73,7 @@
  * scm_init_random().
  */
 
-scm_rng_t scm_the_rng;
+scm_t_rng scm_the_rng;
 
 
 /*
@@ -106,7 +106,7 @@ scm_rng_t scm_the_rng;
 #if SIZEOF_LONG > 4 || defined (HAVE_LONG_LONGS)
 
 unsigned long
-scm_i_uniform32 (scm_i_rstate_t *state)
+scm_i_uniform32 (scm_t_i_rstate *state)
 {
   LONG64 x = (LONG64) A * state->w + state->c;
   LONG32 w = x & 0xffffffffUL;
@@ -132,7 +132,7 @@ scm_i_uniform32 (scm_i_rstate_t *state)
 #define H(x) ((x) >> 16)
 
 unsigned long
-scm_i_uniform32 (scm_i_rstate_t *state)
+scm_i_uniform32 (scm_t_i_rstate *state)
 {
   LONG32 x1 = L (A) * L (state->w);
   LONG32 x2 = L (A) * H (state->w);
@@ -148,7 +148,7 @@ scm_i_uniform32 (scm_i_rstate_t *state)
 #endif
 
 void
-scm_i_init_rstate (scm_i_rstate_t *state, char *seed, int n)
+scm_i_init_rstate (scm_t_i_rstate *state, char *seed, int n)
 {
   LONG32 w = 0L;
   LONG32 c = 0L;
@@ -167,10 +167,10 @@ scm_i_init_rstate (scm_i_rstate_t *state, char *seed, int n)
   state->c = c;
 }
 
-scm_i_rstate_t *
-scm_i_copy_rstate (scm_i_rstate_t *state)
+scm_t_i_rstate *
+scm_i_copy_rstate (scm_t_i_rstate *state)
 {
-  scm_rstate_t *new_state = malloc (scm_the_rng.rstate_size);
+  scm_t_rstate *new_state = malloc (scm_the_rng.rstate_size);
   if (new_state == 0)
     scm_memory_error ("rstate");
   return memcpy (new_state, state, scm_the_rng.rstate_size);
@@ -181,10 +181,10 @@ scm_i_copy_rstate (scm_i_rstate_t *state)
  * Random number library functions
  */
 
-scm_rstate_t *
+scm_t_rstate *
 scm_c_make_rstate (char *seed, int n)
 {
-  scm_rstate_t *state = malloc (scm_the_rng.rstate_size);
+  scm_t_rstate *state = malloc (scm_the_rng.rstate_size);
   if (state == 0)
     scm_memory_error ("rstate");
   state->reserved0 = 0;
@@ -193,7 +193,7 @@ scm_c_make_rstate (char *seed, int n)
 }
 
 
-scm_rstate_t *
+scm_t_rstate *
 scm_c_default_rstate ()
 #define FUNC_NAME "scm_c_default_rstate"
 {
@@ -206,7 +206,7 @@ scm_c_default_rstate ()
 
 
 inline double
-scm_c_uniform01 (scm_rstate_t *state)
+scm_c_uniform01 (scm_t_rstate *state)
 {
   double x = (double) scm_the_rng.random_bits (state) / (double) 0xffffffffUL;
   return ((x + (double) scm_the_rng.random_bits (state))
@@ -214,7 +214,7 @@ scm_c_uniform01 (scm_rstate_t *state)
 }
 
 double
-scm_c_normal01 (scm_rstate_t *state)
+scm_c_normal01 (scm_t_rstate *state)
 {
   if (state->reserved0)
     {
@@ -237,7 +237,7 @@ scm_c_normal01 (scm_rstate_t *state)
 }
 
 double
-scm_c_exp1 (scm_rstate_t *state)
+scm_c_exp1 (scm_t_rstate *state)
 {
   return - log (scm_c_uniform01 (state));
 }
@@ -245,7 +245,7 @@ scm_c_exp1 (scm_rstate_t *state)
 unsigned char scm_masktab[256];
 
 unsigned long
-scm_c_random (scm_rstate_t *state, unsigned long m)
+scm_c_random (scm_t_rstate *state, unsigned long m)
 {
   unsigned int r, mask;
   mask = (m < 0x100
@@ -260,7 +260,7 @@ scm_c_random (scm_rstate_t *state, unsigned long m)
 }
 
 SCM
-scm_c_random_bignum (scm_rstate_t *state, SCM m)
+scm_c_random_bignum (scm_t_rstate *state, SCM m)
 {
   SCM b;
   int i, nd;
@@ -333,10 +333,10 @@ scm_c_random_bignum (scm_rstate_t *state, SCM m)
  * Scheme level representation of random states.
  */
  
-scm_bits_t scm_tc16_rstate;
+scm_t_bits scm_tc16_rstate;
 
 static SCM
-make_rstate (scm_rstate_t *state)
+make_rstate (scm_t_rstate *state)
 {
   SCM_RETURN_NEWSMOB (scm_tc16_rstate, state);
 }
@@ -568,12 +568,12 @@ scm_init_random ()
 {
   int i, m;
   /* plug in default RNG */
-  scm_rng_t rng =
+  scm_t_rng rng =
   {
-    sizeof (scm_i_rstate_t),
+    sizeof (scm_t_i_rstate),
     (unsigned long (*)()) scm_i_uniform32,
     (void (*)())          scm_i_init_rstate,
-    (scm_rstate_t *(*)())    scm_i_copy_rstate
+    (scm_t_rstate *(*)())    scm_i_copy_rstate
   };
   scm_the_rng = rng;