From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Oct 2018 06:43:48 +0000 (+0900)
Subject: Merge branch 'cb/khash-maybe-unused-function'
X-Git-Tag: v2.20.0-rc0~103
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d1622fdbdd83831983e8b99250792e5fca7b9159?ds=inline;hp=-c

Merge branch 'cb/khash-maybe-unused-function'

Build fix.

* cb/khash-maybe-unused-function:
khash: silence -Wunused-function for delta-islands
commit-slabs: move MAYBE_UNUSED out
---

d1622fdbdd83831983e8b99250792e5fca7b9159
diff --combined git-compat-util.h
index 95cfcc1aeb,8121b73b4a..96a3f86d8e
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -382,10 -382,6 +382,10 @@@ static inline char *git_find_last_dir_s
  #define find_last_dir_sep git_find_last_dir_sep
  #endif
  
 +#ifndef query_user_email
 +#define query_user_email() NULL
 +#endif
 +
  #if defined(__HP_cc) && (__HP_cc >= 61000)
  #define NORETURN __attribute__((noreturn))
  #define NORETURN_PTR
@@@ -412,6 -408,8 +412,8 @@@
  #define LAST_ARG_MUST_BE_NULL
  #endif
  
+ #define MAYBE_UNUSED __attribute__((__unused__))
+ 
  #include "compat/bswap.h"
  
  #include "wildmatch.h"