apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r384932 - in /apr/apr/branches/1.2.x: configure.in misc/unix/rand.c
Date Fri, 10 Mar 2006 22:04:31 GMT
Author: wrowe
Date: Fri Mar 10 14:04:31 2006
New Revision: 384932

URL: http://svn.apache.org/viewcvs?rev=384932&view=rev
Log:

  One more evolution of the uuid header detection code.
  
  On Solaris, uuid/uuid.h defined uuid_generate, and itself
  includes sys/uuid.h which only defined the uuid_t.
  
  Therefore prefer the broadest uuid.h, followed by uuid/uuid.h,
  and only if those fail, fall back on sys/uuid.h which may
  contain nothing beyond the sys types of uuid_t entities.

Backports 384930

Modified:
    apr/apr/branches/1.2.x/configure.in
    apr/apr/branches/1.2.x/misc/unix/rand.c

Modified: apr/apr/branches/1.2.x/configure.in
URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/configure.in?rev=384932&r1=384931&r2=384932&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/configure.in (original)
+++ apr/apr/branches/1.2.x/configure.in Fri Mar 10 14:04:31 2006
@@ -1822,7 +1822,7 @@
 dnl ----------------------------- Checking for UUID Support 
 echo "${nl}Checking for OS UUID Support..."
 
-AC_CHECK_HEADERS(uuid.h sys/uuid.h uuid/uuid.h, break)
+AC_CHECK_HEADERS(uuid.h uuid/uuid.h sys/uuid.h, break)
 
 apr_revert_save_LIBS=$LIBS
 
@@ -1838,20 +1838,20 @@
 
 AC_CACHE_CHECK([for os uuid usability], [apr_cv_osuuid], [
 # Ensure this test closely mirrors misc/unix/rand.c!
-uuid_includes=" ${nl}
-#if defined(HAVE_SYS_TYPES_H) ${nl}
-#include <sys/types.h> ${nl}
-#endif ${nl}
-#if defined(HAVE_UNISTD_H) ${nl}
-#include <unistd.h> ${nl}
-#endif ${nl}
-#if defined(HAVE_UUID_H) ${nl}
-#include <uuid.h> ${nl}
-#elif defined(HAVE_SYS_UUID_H) ${nl}
-#include <sys/uuid.h> ${nl}
-#elif defined(HAVE_UUID_UUID_H) ${nl}
-#include <uuid/uuid.h> ${nl}
-#endif ${nl}
+uuid_includes="
+#if defined(HAVE_SYS_TYPES_H)
+#include <sys/types.h>
+#endif
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
+#if defined(HAVE_UUID_H)
+#include <uuid.h>
+#elif defined(HAVE_UUID_UUID_H)
+#include <uuid/uuid.h>
+#elif defined(HAVE_SYS_UUID_H)
+#include <sys/uuid.h>
+#endif
 "
  apr_cv_osuuid=no
  if test $ac_cv_func_uuid_create = yes; then

Modified: apr/apr/branches/1.2.x/misc/unix/rand.c
URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/misc/unix/rand.c?rev=384932&r1=384931&r2=384932&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/misc/unix/rand.c (original)
+++ apr/apr/branches/1.2.x/misc/unix/rand.c Fri Mar 10 14:04:31 2006
@@ -37,10 +37,10 @@
 #endif
 #if defined(HAVE_UUID_H)
 #include <uuid.h>
-#elif defined(HAVE_SYS_UUID_H)
-#include <sys/uuid.h>
 #elif defined(HAVE_UUID_UUID_H)
 #include <uuid/uuid.h>
+#elif defined(HAVE_SYS_UUID_H)
+#include <sys/uuid.h>
 #endif
 
 #ifndef SHUT_RDWR



Mime
View raw message