Merge remote-tracking branch 'origin/released'

* origin/released:
  xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014

Conflicts:
	mesalib/src/glsl/glcpp/glcpp.c
	openssl/Makefile

1 files changed, 24 insertions, 11 deletions

diff --git a/fontconfig/src/fccompat.c b/fontconfig/src/fccompat.c
index b685fade3..19b1ecdc0 100644
--- a/fontconfig/src/fccompat.c
+++ b/fontconfig/src/fccompat.c
@@ -170,14 +170,27 @@ FcRandom(void)
     static struct random_data fcrandbuf;
     static char statebuf[256];
     static FcBool initialized = FcFalse;
+#ifdef _AIX
+    static char *retval;
+    long res;
+#endif
 
     if (initialized != FcTrue)
     {
-	initstate_r(time(NULL), statebuf, 256, &fcrandbuf);
+#ifdef _AIX
+	initstate_r (time (NULL), statebuf, 256, &retval, &fcrandbuf);
+#else
+	initstate_r (time (NULL), statebuf, 256, &fcrandbuf);
+#endif
 	initialized = FcTrue;
     }
 
-    random_r(&fcrandbuf, &result);
+#ifdef _AIX
+    random_r (&res, &fcrandbuf);
+    result = (int32_t)res;
+#else
+    random_r (&fcrandbuf, &result);
+#endif
 #elif HAVE_RANDOM
     static char statebuf[256];
     char *state;
@@ -185,30 +198,30 @@ FcRandom(void)
 
     if (initialized != FcTrue)
     {
-	state = initstate(time(NULL), statebuf, 256);
+	state = initstate (time (NULL), statebuf, 256);
 	initialized = FcTrue;
     }
     else
-	state = setstate(statebuf);
+	state = setstate (statebuf);
 
-    result = random();
+    result = random ();
 
-    setstate(state);
+    setstate (state);
 #elif HAVE_LRAND48
-    result = lrand48();
+    result = lrand48 ();
 #elif HAVE_RAND_R
-    static unsigned int seed = time(NULL);
+    static unsigned int seed = time (NULL);
 
-    result = rand_r(&seed);
+    result = rand_r (&seed);
 #elif HAVE_RAND
     static FcBool initialized = FcFalse;
 
     if (initialized != FcTrue)
     {
-	srand(time(NULL));
+	srand (time (NULL));
 	initialized = FcTrue;
     }
-    result = rand();
+    result = rand ();
 #else
 # error no random number generator function available.
 #endif