summaryrefslogtreecommitdiff
path: root/usage.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2007-03-30 19:07:05 -0400
committerJunio C Hamano <junkio@cox.net>2007-03-31 01:11:11 -0700
commit46efd2d93ce39fd5c1a91f0a2f918f2d8bbfdf92 (patch)
treee49b5f87de3bd93be27c8cb0ee33cbb7e69f4d11 /usage.c
parent86747c132b87fc97bbb134baaffe9ecc12c5a90d (diff)
downloadgit-46efd2d93ce39fd5c1a91f0a2f918f2d8bbfdf92.tar.gz
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 'usage.c')
-rw-r--r--usage.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usage.c b/usage.c
index 4dc5c77633..f5e652cc76 100644
--- a/usage.c
+++ b/usage.c
@@ -86,7 +86,7 @@ int error(const char *err, ...)
return -1;
}
-void warn(const char *warn, ...)
+void warning(const char *warn, ...)
{
va_list params;