From 46efd2d93ce39fd5c1a91f0a2f918f2d8bbfdf92 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 30 Mar 2007 19:07:05 -0400 Subject: 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" Cc: "Randal L. Schwartz" Signed-off-by: Junio C Hamano --- usage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usage.c') diff --git a/usage.c b/usage.c index 4dc5c7763..f5e652cc7 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; -- cgit v1.2.1