Rename the uuid_t type to pg_uuid_t, to avoid a conflict with any

definitions of uuid_t that may be provided by the system headers. This
should hopefully fix the Win32 build problems reported by Magnus.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/include/utils/uuid.h b/src/include/utils/uuid.h
index 12cb00a0b71..4817939d528 100644
--- a/src/include/utils/uuid.h
+++ b/src/include/utils/uuid.h
@@ -1,11 +1,13 @@
 /*-------------------------------------------------------------------------
  *
  * uuid.h
- *	  Header file for the "uuid" data type.
+ *	  Header file for the "uuid" ADT. In C, we use the name pg_uuid_t,
+ *	  to avoid conflicts with any uuid_t type that might be defined by
+ *	  the system headers.
  *
  * Copyright (c) 2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/utils/uuid.h,v 1.1 2007/01/28 16:16:54 neilc Exp $
+ * $PostgreSQL: pgsql/src/include/utils/uuid.h,v 1.2 2007/01/28 20:25:38 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */ 
@@ -16,12 +18,12 @@
 #define UUID_LEN 16
 
 /* opaque struct; defined in uuid.c */
-typedef struct uuid_t uuid_t;
+typedef struct pg_uuid_t pg_uuid_t;
 
 /* fmgr interface macros */
 #define UUIDPGetDatum(X)		PointerGetDatum(X)
 #define PG_RETURN_UUID_P(X)		return UUIDPGetDatum(X)
-#define DatumGetUUIDP(X)		((uuid_t *) DatumGetPointer(X))
+#define DatumGetUUIDP(X)		((pg_uuid_t *) DatumGetPointer(X))
 #define PG_GETARG_UUID_P(X)		DatumGetUUIDP(PG_GETARG_DATUM(X))
 
 #endif   /* UUID_H */