Merge branch 'jw/gitweb-sample-update' into maint

diff --git a/commit-slab-impl.h b/commit-slab-impl.h
index ac1e6d409ad6cf1109f1e439944bd2fb1ab9e58e..5c0eb91a5d175ddb079459a0ba13b9be1f74b1ab 100644 (file)
--- a/commit-slab-impl.h
+++ b/commit-slab-impl.h
@@ -1,10 +1,10 @@
 #ifndef COMMIT_SLAB_IMPL_H
 #define COMMIT_SLAB_IMPL_H
 
-#define MAYBE_UNUSED __attribute__((__unused__))
+#include "git-compat-util.h"
 
 #define implement_static_commit_slab(slabname, elemtype) \
-       implement_commit_slab(slabname, elemtype, static MAYBE_UNUSED)
+       implement_commit_slab(slabname, elemtype, MAYBE_UNUSED static)
 
 #define implement_shared_commit_slab(slabname, elemtype) \
        implement_commit_slab(slabname, elemtype, )