diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2007-03-30 19:07:05 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-31 01:11:11 -0700 |
| commit | 46efd2d93ce39fd5c1a91f0a2f918f2d8bbfdf92 (patch) | |
| tree | e49b5f87de3bd93be27c8cb0ee33cbb7e69f4d11 /revision.c | |
| parent | 86747c132b87fc97bbb134baaffe9ecc12c5a90d (diff) | |
| download | git-46efd2d93ce39fd5c1a91f0a2f918f2d8bbfdf92.tar.gz git-46efd2d93ce39fd5c1a91f0a2f918f2d8bbfdf92.tar.xz | |
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 'revision.c')
| -rw-r--r-- | revision.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c index f23c1d522..486393cb0 100644 --- a/revision.c +++ b/revision.c @@ -486,7 +486,7 @@ static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data) add_pending_object(cb->all_revs, o, ""); } else if (!cb->warned_bad_reflog) { - warn("reflog of '%s' references pruned commits", + warning("reflog of '%s' references pruned commits", cb->name_for_errormsg); cb->warned_bad_reflog = 1; } |