Merge changes from CUPS 1.5svn-r9049 (private header support)

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

diff --git a/config.h.in b/config.h.in
index da096f59cc6418e4b9efe8e967b16274a4d22441..d6cf1234b032b3335b16aa4e396b305924bcc8af 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1,9 +1,9 @@
 /*
  * "$Id: config.h.in 7918 2008-09-08 22:03:01Z mike $"
  *
- *   Configuration file for the Common UNIX Printing System (CUPS).
+ *   Configuration file for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -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?
  */
@@ -434,6 +418,7 @@
 
 #undef HAVE_USERSEC_H
 
+
 /*
  * Do we have pthread support?
  */
@@ -601,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?