summaryrefslogtreecommitdiffstats
path: root/libglusterfs/src/compat-uuid.h
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2018-07-23 11:35:16 +0200
committerNiels de Vos <ndevos@redhat.com>2018-07-27 17:37:32 +0000
commit7f7296d1f52f1b4308551fafad4eb22e3855b382 (patch)
treeb754251445e6703f08ef1271a610e8f831248f23 /libglusterfs/src/compat-uuid.h
parent35cfc01fa2e395111f7d629f00dc06eecf35a709 (diff)
build: remove uuid from contrib/
Bundling libuuid is not needed anymore, all current distributions provide it now. Some OS's provide their own uuid_*() functions in libc. These may not be fully compatible with libuuid.so found on Linux systems. In that case, either e2fsprogs-libuuid can be installed, or support for the native uuid_*() functions can be added to libglusterfs/src/compat-uuid.h. Change-Id: Icfa48caea81307a3bca549364969c2038911942b Fixes: bz#1607319 Signed-off-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'libglusterfs/src/compat-uuid.h')
-rw-r--r--libglusterfs/src/compat-uuid.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libglusterfs/src/compat-uuid.h b/libglusterfs/src/compat-uuid.h
index 8dac6990388..2e66117ce1f 100644
--- a/libglusterfs/src/compat-uuid.h
+++ b/libglusterfs/src/compat-uuid.h
@@ -57,6 +57,10 @@ gf_uuid_unparse (const uuid_t uuid, char *out)
uuid_unparse (uuid, out);
}
+#elif defined(__FreeBSD__)
+
+#error Please install e2fsprogs-libuuid for a compatible libuuid implementation.
+
/* TODO: add more uuid APIs, use constructs like this:
#elif defined(__NetBSD__) * NetBSD libc *
@@ -70,9 +74,5 @@ gf_uuid_clear (uuid_t uuid)
*/
-#else /* use bundled Linux like libuuid from contrib/uuid/ */
-
-#include "uuid.h"
-
#endif /* HAVE_UUID */
#endif /* _GF_UUID_H */