apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Craig Rodrigues <rodr...@crodrigues.org>
Subject [PATCH] Do not include <uuid.h> and <uuid/uuid.h> in same file
Date Wed, 02 Nov 2005 20:48:50 GMT
Hi,

I maintain the port of APR for the FreeBSD ports system.
I was assigned the following bug:

http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/88406

If e2fsprogs is installed on a FreeBSD 5.4 system,
compilation of APR fails, because types conflict
if <uuid.h> (from the system) and <uuid/uuid.h> (from e2fsprogs) are
both included.

<uuid.h> is a relatively recent addition to FreeBSD and
was added in the FreeBSD 5.x timeframe.

Is this patch acceptable for apr?

Index: rand.c
===================================================================
--- rand.c	(revision 330355)
+++ rand.c	(working copy)
@@ -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

-- 
Craig Rodrigues        
rodrigc@crodrigues.org

Mime
View raw message