diff options
| author | pquerna <pquerna@13f79535-47bb-0310-9956-ffa450edef68> | 2005-05-03 02:01:12 +0000 |
|---|---|---|
| committer | pquerna <pquerna@13f79535-47bb-0310-9956-ffa450edef68> | 2005-05-03 02:01:12 +0000 |
| commit | fbb8cec73234780ccbe29294943bb75311732c56 (patch) | |
| tree | d9cd950f99672197c4b8820d377d08f5fc17a593 /misc/unix | |
| parent | 97025198c7aa3723b8bd119e37ae0563594b4de5 (diff) | |
| download | libapr-fbb8cec73234780ccbe29294943bb75311732c56.tar.gz | |
- Add support for uuid_generate on OS X 10.4. This required some extra foot
work since Apple put the uuid_generate functions into their libc, while Linux
keeps them in libuuid.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@167847 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'misc/unix')
| -rw-r--r-- | misc/unix/rand.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/misc/unix/rand.c b/misc/unix/rand.c index efcdf1fef..431fd876c 100644 --- a/misc/unix/rand.c +++ b/misc/unix/rand.c @@ -35,6 +35,12 @@ #if APR_HAVE_SYS_UN_H #include <sys/un.h> #endif +#if APR_HAVE_UUID_UUID_H +#include <uuid/uuid.h> +#endif +#if APR_HAVE_UUID_H +#include <uuid.h> +#endif #ifndef SHUT_RDWR #define SHUT_RDWR 2 @@ -42,8 +48,6 @@ #if HAVE_UUID_CREATE -#include <uuid.h> - APR_DECLARE(apr_status_t) apr_os_uuid_get(unsigned char *uuid_data) { uuid_t g; @@ -55,9 +59,7 @@ APR_DECLARE(apr_status_t) apr_os_uuid_get(unsigned char *uuid_data) return APR_SUCCESS; } -#elif HAVE_LIBUUID - -#include <uuid/uuid.h> +#elif HAVE_UUID_GENERATE APR_DECLARE(apr_status_t) apr_os_uuid_get(unsigned char *uuid_data) { |