Commit 11d1f244 authored by Matthias Andree's avatar Matthias Andree

Rename lock_release to fm_lock_release, to avoid namespace collision on

Darwin. NetBSD PR#28543 (pkg/28543).

svn path=/trunk/; revision=4176
parent 400b4316
......@@ -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:
......
......@@ -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)
......
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment