diff options
| -rw-r--r-- | libglusterfs/src/common-utils.h | 2 | ||||
| -rw-r--r-- | libglusterfs/src/compat-uuid.h | 13 |
2 files changed, 4 insertions, 11 deletions
diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h index 15ca1ef6a50..51e05515401 100644 --- a/libglusterfs/src/common-utils.h +++ b/libglusterfs/src/common-utils.h @@ -24,6 +24,7 @@ #endif #include <limits.h> #include <fnmatch.h> +#include <uuid/uuid.h> #ifndef ffsll #define ffsll(x) __builtin_ffsll(x) @@ -43,7 +44,6 @@ trap(void); #include "mem-pool.h" #include "compat-uuid.h" #include "iatt.h" -#include "uuid.h" #include "libglusterfs-messages.h" #include "protocol-common.h" #include "iobuf.h" diff --git a/libglusterfs/src/compat-uuid.h b/libglusterfs/src/compat-uuid.h index 6bce6d033d0..6e7fdefbfab 100644 --- a/libglusterfs/src/compat-uuid.h +++ b/libglusterfs/src/compat-uuid.h @@ -11,9 +11,7 @@ #ifndef _GF_UUID_H #define _GF_UUID_H -#if defined(HAVE_LIBUUID) /* Linux like libuuid.so */ - -#include <uuid.h> +#include <uuid/uuid.h> static inline void gf_uuid_clear(uuid_t uuid) @@ -57,12 +55,8 @@ 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 * +#if defined(__NetBSD__) * NetBSD libc * #include <string.h> @@ -71,8 +65,7 @@ gf_uuid_clear (uuid_t uuid) { memset (uuid, 0, sizeof (uuid_t)); } - +#endif */ -#endif /* HAVE_UUID */ #endif /* _GF_UUID_H */ |