Merge branch 'cb/khash-maybe-unused-function'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Oct 2018 06:43:48 +0000 (15:43 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Oct 2018 06:43:48 +0000 (15:43 +0900)
Build fix.

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

1  2 
git-compat-util.h

diff --combined 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
  #define LAST_ARG_MUST_BE_NULL
  #endif
  
+ #define MAYBE_UNUSED __attribute__((__unused__))
  #include "compat/bswap.h"
  
  #include "wildmatch.h"