aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Tulak <jtulak@redhat.com>2018-12-06 17:10:00 -0600
committerEric Sandeen <sandeen@redhat.com>2018-12-06 17:10:00 -0600
commit6ff49bf7951e5951bd8f938fc3662c896a1bf9e8 (patch)
treebcc8826b785fd36fc0e3d55cdc1ce3e082c50b8e
parentfc342f7803580ff0c63c30129d2283991d186ba3 (diff)
downloadxfsdump-dev-6ff49bf7951e5951bd8f938fc3662c896a1bf9e8.tar.gz
common/types.h: Wrap #define UUID_STR_LEN 36 in #ifndef
Current Fedora 28 has the constant it in uuid/uuid.h where it belongs (per comment next to the define), so we should treat the define as a backward-compatibility workaround, rather than enforcing it for all. Signed-off-by: Jan Tulak <jtulak@redhat.com> [sandeen: tweak comment to match] Reviewed-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
-rw-r--r--common/types.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/common/types.h b/common/types.h
index 50c841ee..b6196677 100644
--- a/common/types.h
+++ b/common/types.h
@@ -33,9 +33,11 @@
#define XFSDUMP_DIRPATH inv_basepath()
/*
- * Should be, but isn't, defined in uuid/uuid.h
+ * If not defined in uuid/uuid.h
*/
+#ifndef UUID_STR_LEN
#define UUID_STR_LEN 36
+#endif
/* fundamental page size - probably should not be hardwired, but
* for now we will