Merge changes from CUPS 1.5svn-r8950.

[thirdparty/cups.git] / config.h.in

diff --git a/config.h.in b/config.h.in
index 5aceeb6d8a548dbae0cf03dc30599672d0f343cc..cf33d3ac129f16519e7396135d8c413caff1ec87 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -335,14 +335,6 @@
 #undef HAVE_DNSSD
 
 
-/*
- * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
- */
-
-#undef HAVE_COREFOUNDATION
-#undef HAVE_SYSTEMCONFIGURATION
-
-
 /*
  * Do we have <sys/ioctl.h>?
  */
@@ -350,14 +342,6 @@
 #undef HAVE_SYS_IOCTL_H
 
 
-/*
- * Do we have mkstemp() and/or mkstemps()?
- */
-
-#undef HAVE_MKSTEMP
-#undef HAVE_MKSTEMPS
-
-
 /*
  * Does the "tm" structure contain the "tm_gmtoff" member?
  */
@@ -602,10 +586,24 @@
  * Which random number generator function to use...
  */
 
+#undef HAVE_ARC4RANDOM
 #undef HAVE_RANDOM
-#undef HAVE_MRAND48
 #undef HAVE_LRAND48
 
+#ifdef HAVE_ARC4RANDOM
+#  define CUPS_RAND() arc4random()
+#  define CUPS_SRAND(v) arc4random_stir()
+#elif defined(HAVE_RANDOM)
+#  define CUPS_RAND() random()
+#  define CUPS_SRAND(v) srandom(v)
+#elif defined(HAVE_LRAND48)
+#  define CUPS_RAND() lrand48()
+#  define CUPS_SRAND(v) srand48(v)
+#else
+#  define CUPS_RAND() rand()
+#  define CUPS_SRAND(v) srand(v)
+#endif /* HAVE_ARC4RANDOM */
+
 
 /*
  * Do we have vproc_transaction_begin/end?