Merge branch 'jk/mailmap-only-at-root'

[thirdparty/git.git] / git-compat-util.h

diff --git a/git-compat-util.h b/git-compat-util.h
index 5d5e47fbe2d66997f569301eadd462809c0cab92..838246289c2902ee12b1d549cb3b3912a6fadae9 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -252,9 +252,9 @@ typedef unsigned long uintptr_t;
 #ifdef PRECOMPOSE_UNICODE
 #include "compat/precompose_utf8.h"
 #else
-static inline void precompose_argv(int argc, const char **argv)
+static inline const char *precompose_argv_prefix(int argc, const char **argv, const char *prefix)
 {
-       ; /* nothing */
+       return prefix;
 }
 #define probe_utf8_pathname_composition()
 #endif