Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

2009-09-28 09:59:59 -06:00
parent 151e0c0aea d09941c8cc
commit eeb7e04da6
6 changed files with 115 additions and 56 deletions
@@ -88,6 +88,12 @@

 #define HASH_ALLOC malloc
 #define HASH_FREE  free
+#ifndef __GLIBC__
+#define HASH_RANDOM_DECL	char *ps, rs[256]
+#define HASH_RANDOM_INIT(seed)	ps = initstate(seed, rs, sizeof(rs))
+#define HASH_RANDOM		random()
+#define HASH_RANDOM_DESTROY	setstate(ps)
+#else
 #define HASH_RANDOM_DECL	struct random_data rd; int32_t rv; char rs[256]
 #define HASH_RANDOM_INIT(seed)					\
   do {								\
@@ -96,6 +102,7 @@
   } while(0)
 #define HASH_RANDOM             ((void) random_r(&rd, &rv), rv)
 #define HASH_RANDOM_DESTROY
+#endif

 typedef struct __glxHashBucket
 {