apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roo...@apache.org
Subject svn commit: r355780 - in /apr/apr/trunk: CHANGES misc/unix/rand.c
Date Sat, 10 Dec 2005 20:53:36 GMT
Author: rooneg
Date: Sat Dec 10 12:53:34 2005
New Revision: 355780

URL: http://svn.apache.org/viewcvs?rev=355780&view=rev
Log:
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>

Modified:
    apr/apr/trunk/CHANGES
    apr/apr/trunk/misc/unix/rand.c

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/CHANGES?rev=355780&r1=355779&r2=355780&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES (original)
+++ apr/apr/trunk/CHANGES Sat Dec 10 12:53:34 2005
@@ -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

Modified: apr/apr/trunk/misc/unix/rand.c
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/misc/unix/rand.c?rev=355780&r1=355779&r2=355780&view=diff
==============================================================================
--- apr/apr/trunk/misc/unix/rand.c (original)
+++ apr/apr/trunk/misc/unix/rand.c Sat Dec 10 12:53:34 2005
@@ -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



Mime
View raw message