summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2007-03-30 23:07:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-31 08:11:11 (GMT)
commit46efd2d93ce39fd5c1a91f0a2f918f2d8bbfdf92 (patch)
treee49b5f87de3bd93be27c8cb0ee33cbb7e69f4d11 /git-compat-util.h
parent86747c132b87fc97bbb134baaffe9ecc12c5a90d (diff)
downloadgit-46efd2d93ce39fd5c1a91f0a2f918f2d8bbfdf92.zip
git-46efd2d93ce39fd5c1a91f0a2f918f2d8bbfdf92.tar.gz
git-46efd2d93ce39fd5c1a91f0a2f918f2d8bbfdf92.tar.bz2
Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS
This fixes a problem reported by Randal Schwartz: >I finally tracked down all the (albeit inconsequential) errors I was getting >on both OpenBSD and OSX. It's the warn() function in usage.c. There's >warn(3) in BSD-style distros. It'd take a "great rename" to change it, but if >someone with better C skills than I have could do that, my linker and I would >appreciate it. It was annoying to me, too, when I was doing some mergetool testing on Mac OS X, so here's a fix. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Cc: "Randal L. Schwartz" <merlyn@stonehenge.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 7534db1..139fc19 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -87,7 +87,7 @@
extern void usage(const char *err) NORETURN;
extern void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));
extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
-extern void warn(const char *err, ...) __attribute__((format (printf, 1, 2)));
+extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
extern void set_usage_routine(void (*routine)(const char *err) NORETURN);
extern void set_die_routine(void (*routine)(const char *err, va_list params) NORETURN);