diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | fetchmail.c | 4 | ||||
| -rw-r--r-- | fetchmail.h | 6 | ||||
| -rw-r--r-- | lock.c | 2 |
4 files changed, 9 insertions, 5 deletions
@@ -147,6 +147,8 @@ OTHER CHANGES: * Put *BOLD* text into the manual page near --mda to state unmistakably that the --mda %T and %F substitutions add single quotes, hoping to avoid bogus bug reports such as Debian Bug #224564. Matthias Andree +* Rename lock_release to fm_lock_release, to avoid namespace collision on + Darwin. NetBSD PR#28543 (pkg/28543). Matthias Andree. fetchmail-6.2.5 (Wed Oct 15 18:39:22 EDT 2003), 23079 lines: diff --git a/fetchmail.c b/fetchmail.c index abc717e0..01d4ad4f 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -406,7 +406,7 @@ int main(int argc, char **argv) { fprintf(stderr,GT_("fetchmail: %s fetchmail at %d killed.\n"), bkgd ? GT_("background") : GT_("foreground"), pid); - lock_release(); + fm_lock_release(); if (argc == 2) exit(0); else @@ -1330,7 +1330,7 @@ static RETSIGTYPE terminate_run(int sig) memset(ctl->password, '\0', strlen(ctl->password)); #if !defined(HAVE_ATEXIT) && !defined(HAVE_ON_EXIT) - lock_release(); + fm_lock_release(); #endif if (activecount == 0) diff --git a/fetchmail.h b/fetchmail.h index 1428f8fb..74121bd5 100644 --- a/fetchmail.h +++ b/fetchmail.h @@ -490,8 +490,10 @@ int gen_transact(); extern struct msgblk msgblk; /* lock.c: concurrency locking */ -void lock_setup(void), lock_assert(void); -void lock_or_die(void), lock_release(void); +void lock_setup(void); +void lock_assert(void); +void lock_or_die(void); +void fm_lock_release(void); int lock_state(void); void lock_dispose(void); @@ -137,7 +137,7 @@ void lock_or_die(void) } } -void lock_release(void) +void fm_lock_release(void) /* release a lock on a given host */ { unlink(lockfile); |