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
scantist-ossops-m2 · Dec 10, 2005 · 3fded78 · 3fded78
1 parent 8754e69
commit 3fded78
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+Changes for APR ???
+
+  *) Only include uuid/uuid.h if we haven't already included uuid.h, since
+     doing so can result in type conflicts.
+     [Craig Rodrigues <rodrigc at crodrigues.org>]
+
 Changes for APR 1.3.0
 
   *) Bugfix for apr_pollset_poll() on systems that implement pollsets

diff --git 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