diff options
| author | Garrett Rooney <rooneg@apache.org> | 2005-12-10 20:53:34 +0000 |
|---|---|---|
| committer | Garrett Rooney <rooneg@apache.org> | 2005-12-10 20:53:34 +0000 |
| commit | 3fded788388249858181486a9a05a929fc599937 (patch) | |
| tree | a4fee1ad6e866ef323904f58cf25fffff8f2224d /misc | |
| parent | 8754e6947327abf681a6df2c63f2cc388af064bf (diff) | |
| download | apr-3fded788388249858181486a9a05a929fc599937.tar.gz | |
Only include uuid/uuid.h if we havne't already included uuid.h, since including both can result in type conflicts depending on what packages
have been installed on a machine.
* misc/unix/rand.c: Only include uuid/uuid.h if we haven't included
uuid.h.
* CHANGES: Note change.
Submitted by: Craig Rodrigues <rodrigc at crodrigues.org>
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@355780 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/unix/rand.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/misc/unix/rand.c b/misc/unix/rand.c index 4691f08a1..1763bb413 100644 --- a/misc/unix/rand.c +++ b/misc/unix/rand.c @@ -35,11 +35,10 @@ #if APR_HAVE_SYS_UN_H #include <sys/un.h> #endif -#ifdef HAVE_UUID_UUID_H -#include <uuid/uuid.h> -#endif #ifdef HAVE_UUID_H #include <uuid.h> +#elif defined(HAVE_UUID_UUID_H) +#include <uuid/uuid.h> #endif #ifndef SHUT_RDWR |