skunkweb build fails under osx

--Apple-Mail-2--653243590
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	delsp=yes;
	format=flowed

Howdy List,
	The build fails on OSX due to a previously defined uuid_t struct in / 
usr/include/unistd.h.  I have attached a patch that changes the named  
uuid_t in pylibs/uuid/dav_opaquelock.h, pylibs/uuid/dav_opaquelock.c,  
pylibs/uuid/_uuidmodule.c, and to sk_uuid_t which compiles without  
issue.

	Thanks much,
	Fred



--Apple-Mail-2--653243590
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name=uuid_t.patch
Content-Disposition: attachment;
	filename=uuid_t.patch

diff -urN skunkweb-3.4.4/pylibs/uuid/_uuidmodule.c skunkweb-3.4.4.new/pylibs/uuid/_uuidmodule.c
--- skunkweb-3.4.4/pylibs/uuid/_uuidmodule.c	2003-05-01 16:46:03.000000000 -0400
+++ skunkweb-3.4.4.new/pylibs/uuid/_uuidmodule.c	2007-12-28 07:22:41.000000000 -0500
@@ -14,7 +14,7 @@
     PyObject* ret;
     char* lt;
     uuid_state st;
-    uuid_t u;
+    sk_uuid_t u;
 
     if (!PyArg_ParseTuple(args, ""))
 	return NULL;
diff -urN skunkweb-3.4.4/pylibs/uuid/dav_opaquelock.c skunkweb-3.4.4.new/pylibs/uuid/dav_opaquelock.c
--- skunkweb-3.4.4/pylibs/uuid/dav_opaquelock.c	2001-08-05 10:57:47.000000000 -0400
+++ skunkweb-3.4.4.new/pylibs/uuid/dav_opaquelock.c	2007-12-28 07:15:57.000000000 -0500
@@ -69,9 +69,9 @@
 
 typedef unsigned64_t uuid_time_t;
 
-const uuid_t null_locktoken = {0};
+const sk_uuid_t null_locktoken = {0};
 
-static void format_uuid_v1(uuid_t * uuid, unsigned16 clockseq, uuid_time_t timestamp, uuid_node_t node);
+static void format_uuid_v1(sk_uuid_t * uuid, unsigned16 clockseq, uuid_time_t timestamp, uuid_node_t node);
 static void get_current_time(uuid_time_t * timestamp);
 static unsigned16 true_random(void);
 static void get_pseudo_node_identifier(uuid_node_t *node);
@@ -85,7 +85,7 @@
  *
  *   Should postpend pid to account for non-seralized creation?
  */
-int dav_create_opaquelocktoken(uuid_state *st, uuid_t *u)
+int dav_create_opaquelocktoken(uuid_state *st, sk_uuid_t *u)
 {
     uuid_time_t timestamp;
     
@@ -109,7 +109,7 @@
  *    of an opaquelocktoken
  */
 
-char *dav_format_opaquelocktoken(const uuid_t *u)
+char *dav_format_opaquelocktoken(const sk_uuid_t *u)
 {
     char* buf;
     buf = malloc(37);
@@ -148,12 +148,12 @@
 }
 
 /* dav_parse_opaquelocktoken:  Parses string produced from
- *    dav_format_opaquelocktoken back into a uuid_t
+ *    dav_format_opaquelocktoken back into a sk_uuid_t
  *    structure.
  *
  * Returns 0 on success, 1 on failure.
  */
-int dav_parse_opaquelocktoken(const char *char_token, uuid_t *bin_token)
+int dav_parse_opaquelocktoken(const char *char_token, sk_uuid_t *bin_token)
 {
     int i;
 
@@ -194,13 +194,13 @@
  *   == 0 : a = b
  *    > 0 : a > b
  */
-int dav_compare_opaquelocktoken(const uuid_t a, const uuid_t b)
+int dav_compare_opaquelocktoken(const sk_uuid_t a, const sk_uuid_t b)
 {
-    return memcmp(&a, &b, sizeof(uuid_t));
+    return memcmp(&a, &b, sizeof(sk_uuid_t));
 }
 
 /* format_uuid_v1 -- make a UUID from the timestamp, clockseq, and node ID */
-static void format_uuid_v1(uuid_t * uuid, unsigned16 clock_seq,
+static void format_uuid_v1(sk_uuid_t * uuid, unsigned16 clock_seq,
 			   uuid_time_t timestamp, uuid_node_t node)
 {
     /* Construct a version 1 uuid with the information we've gathered
diff -urN skunkweb-3.4.4/pylibs/uuid/dav_opaquelock.h skunkweb-3.4.4.new/pylibs/uuid/dav_opaquelock.h
--- skunkweb-3.4.4/pylibs/uuid/dav_opaquelock.h	2001-08-05 10:57:47.000000000 -0400
+++ skunkweb-3.4.4.new/pylibs/uuid/dav_opaquelock.h	2007-12-28 07:13:35.000000000 -0500
@@ -53,8 +53,6 @@
     char nodeID[6];
 } uuid_node_t;
 
-#undef uuid_t
-
 typedef struct _uuid_t
 {
     unsigned32	time_low;
@@ -63,7 +61,7 @@
     unsigned8	clock_seq_hi_and_reserved;
     unsigned8	clock_seq_low;
     unsigned8	node[6];
-} uuid_t;
+} sk_uuid_t;
 
 /* data type for UUID generator persistent state */
 	
@@ -72,14 +70,14 @@
     unsigned16 cs;        /* saved clock sequence */
 } uuid_state;
 
-extern const uuid_t null_locktoken;
+extern const sk_uuid_t null_locktoken;
 
 /* in dav_opaquelock.c */
-int dav_create_opaquelocktoken(uuid_state *st, uuid_t *u);
+int dav_create_opaquelocktoken(uuid_state *st, sk_uuid_t *u);
 void dav_create_uuid_state(uuid_state *st);
-char *dav_format_opaquelocktoken(const uuid_t *u);
-int dav_compare_opaquelocktoken(const uuid_t a, const uuid_t b);
-int dav_parse_opaquelocktoken(const char *char_token, uuid_t *bin_token);
+char *dav_format_opaquelocktoken(const sk_uuid_t *u);
+int dav_compare_opaquelocktoken(const sk_uuid_t a, const sk_uuid_t b);
+int dav_parse_opaquelocktoken(const char *char_token, sk_uuid_t *bin_token);
 
 /* in mod_dav.c */
     /*uuid_state *dav_get_uuid_state(request_rec *r);*/
diff -urN skunkweb-3.4.4/pylibs/uuid/testopl.c skunkweb-3.4.4.new/pylibs/uuid/testopl.c
--- skunkweb-3.4.4/pylibs/uuid/testopl.c	2001-08-05 10:57:47.000000000 -0400
+++ skunkweb-3.4.4.new/pylibs/uuid/testopl.c	2007-12-28 07:23:32.000000000 -0500
@@ -3,7 +3,7 @@
 int main()
 {
     uuid_state st;
-    uuid_t u;
+    sk_uuid_t u;
     const char *lt;
 
     dav_create_uuid_state(&st);

--Apple-Mail-2--653243590
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
--Apple-Mail-2--653243590
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Skunkweb-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skunkweb-list

--Apple-Mail-2--653243590--