Commit Diff

Commit:
9d70a0bf7236fdcfbe7186f0d90a5a15f5a10b18
From:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
portable: make UUID includes generic Move the detection of UUID header files to be included portably. This will have no functional effect until MacOS detection is put in place.
Actions:
Patch | Tree
commit - db65f874c236d1161ed10289c58eb5e3e5ca72a4
commit + 9d70a0bf7236fdcfbe7186f0d90a5a15f5a10b18
blob - 43e2e48d8e287757aa51bd8b89fa4d136904b88d
blob + 9fc89b9dcace2ed2e34babe66f47c77677e29969
--- include/got_compat.h
+++ include/got_compat.h
@@ -78,6 +78,8 @@ void uuid_create(uuid_t *, uint32_t *);
 void uuid_create_nil(struct uuid *, uint32_t *);
 void uuid_from_string(const char *, uuid_t *, uint32_t *);
 void uuid_to_string(uuid_t *, char **, uint32_t *);
+#else
+#include <uuid.h>
 #endif
 
 #ifdef HAVE_STDINT_H
blob - fe4639d84da9c3b57c93f789d62a178f3b7f872b
blob + 21ca530e0fadeb4dce015815e1cbeb5a7a162ada
--- lib/error.c
+++ lib/error.c
@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <zlib.h>
-#include <uuid.h>
 
 #include "got_compat.h"
 
blob - d4b0bd3eb4f7883233361e8bdb3dab94bfb2e087
blob + 1ca39a72c12f0bce3c5d7e3d226cc9c091e0f36c
--- lib/fetch.c
+++ lib/fetch.c
@@ -34,7 +34,6 @@
 #include <ctype.h>
 #include <limits.h>
 #include <time.h>
-#include <uuid.h>
 
 #include "got_error.h"
 #include "got_reference.h"
blob - 0f6acd7183de5d276439102cc646435ef0addc3a
blob + 90e142ecff05e48b31d5eacde6c048c20d94880e
--- lib/fileindex.c
+++ lib/fileindex.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <limits.h>
 #include <unistd.h>
-#include <uuid.h>
 
 #include "got_compat.h"
 
blob - 81651ea9a69945909619bd8d59a07dba9f31ed06
blob + 869a01509fa0e3327ca53f0dd8ab3844302e24b8
--- lib/repository.c
+++ lib/repository.c
@@ -35,7 +35,6 @@
 #include <errno.h>
 #include <libgen.h>
 #include <stdint.h>
-#include <uuid.h>
 
 #include "bloom.h"
 
blob - c416b704f69a3b179272a5a9a7598ea6c4cf300a
blob + a2ef53cb9fc79da08e0da0999bcf7504b3712b9e
--- lib/send.c
+++ lib/send.c
@@ -35,7 +35,6 @@
 #include <ctype.h>
 #include <limits.h>
 #include <time.h>
-#include <uuid.h>
 
 #include "got_error.h"
 #include "got_reference.h"
blob - e1b7e4afe3cfeb497fdb514b0e081d0684796aa8
blob + b734a84a9d97091c18294f1ff1dfb7e766cc0e19
--- lib/worktree.c
+++ lib/worktree.c
@@ -29,7 +29,6 @@
 #include <zlib.h>
 #include <fnmatch.h>
 #include <libgen.h>
-#include <uuid.h>
 
 #include "got_compat.h"
 
blob - c2e7cf9af0b789d231a7426c323a6b7ddfafb726
blob + 6d61529dcbf140930872d1c171b6edf9fea13692
--- lib/worktree_open.c
+++ lib/worktree_open.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <uuid.h>
 
 #include "got_cancel.h"
 #include "got_error.h"