From 11da83a0e70d32ed0e06a5c948cd8343f8ad5102 Mon Sep 17 00:00:00 2001
From: Tom Lane
Date: Tue, 29 Nov 2016 14:08:23 -0500
Subject: Add uuid to the set of types supported by contrib/btree_gist.

Paul Jungwirth, reviewed and hacked on by Teodor Sigaev, Ildus
Kurbangaliev, Adam Brusselback, Chris Bandy, and myself.

Discussion: https://postgr.es/m/CA+renyUEE29=X01JXdz8_TQvo6n9=2XoEBBRnQ8rkLyr+kjPxQ@mail.gmail.com
Discussion: https://postgr.es/m/55F6EE82.8080209@sigaev.ru
---
 src/backend/utils/adt/uuid.c | 9 ---------
 src/include/utils/uuid.h     | 8 +++++---
 2 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/backend/utils/adt/uuid.c b/src/backend/utils/adt/uuid.c
index c59e74da3d1..bea630e792d 100644
--- a/src/backend/utils/adt/uuid.c
+++ b/src/backend/utils/adt/uuid.c
@@ -22,15 +22,6 @@
 #include "utils/sortsupport.h"
 #include "utils/uuid.h"
 
-/* uuid size in bytes */
-#define UUID_LEN 16
-
-/* pg_uuid_t is declared to be struct pg_uuid_t in uuid.h */
-struct pg_uuid_t
-{
-	unsigned char data[UUID_LEN];
-};
-
 /* sortsupport for uuid */
 typedef struct
 {
diff --git a/src/include/utils/uuid.h b/src/include/utils/uuid.h
index 897382f2e5d..c6766805e05 100644
--- a/src/include/utils/uuid.h
+++ b/src/include/utils/uuid.h
@@ -14,11 +14,13 @@
 #ifndef UUID_H
 #define UUID_H
 
-/* guid size in bytes */
+/* uuid size in bytes */
 #define UUID_LEN 16
 
-/* opaque struct; defined in uuid.c */
-typedef struct pg_uuid_t pg_uuid_t;
+typedef struct pg_uuid_t
+{
+	unsigned char data[UUID_LEN];
+} pg_uuid_t;
 
 /* fmgr interface macros */
 #define UUIDPGetDatum(X)		PointerGetDatum(X)
-- 
cgit v1.2.3