Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'cb/khash-maybe-unused-function'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 30 Oct 2018 06:43:48 +0000
(15:43 +0900)
committer
Junio 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
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
compact
(merge:
da3e075
d99ea5f
)
diff --combined
git-compat-util.h
index 95cfcc1aeb3ec51e602f378bc9e94dd5cccb123c,8121b73b4a98e896994054d4369143bdb0b71a99..96a3f86d8e6991e19815008a3a6b8cebe95b1ca8
---
1
/
git-compat-util.h
---
2
/
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"