diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2006-03-10 22:04:07 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2006-03-10 22:04:07 +0000 |
| commit | 93ddbc7d4644b8ff75e21a905fcb947414337cf7 (patch) | |
| tree | 21277ea03554a608518e24f5a5bd66db863add04 /misc/unix | |
| parent | e0e5daa88c522322edf79f98af960be2ea09bef2 (diff) | |
| download | libapr-93ddbc7d4644b8ff75e21a905fcb947414337cf7.tar.gz | |
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.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@384930 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'misc/unix')
| -rw-r--r-- | misc/unix/rand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/unix/rand.c b/misc/unix/rand.c index 8e063533b..28359b959 100644 --- a/misc/unix/rand.c +++ b/misc/unix/rand.c @@ -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 |