Rename lock_release to fm_lock_release, to avoid namespace collision on

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

svn path=/trunk/; revision=4176

diff --git a/NEWS b/NEWS
index cf2c8f83535c392695034004fe70088f290b955b..73783d3cb580851d8c48e64dc109a73a1931ce24 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 abc717e0987f40f96b9778cd65fc945191794f3e..01d4ad4f7f1b0cfe9991feaf1a9c4469f7351dc2 100644 (file)
--- 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 1428f8fb668b2a388040bbc11ae98518659f8e67..74121bd5ea898d2f68596859f993702474ff1bd5 100644 (file)
--- 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);
 

diff --git a/lock.c b/lock.c
index 82d57af92fb725301bd87dd0ff36334a7731268a..b8dbc50308a52ffd75d8807aa4405a3a8c3a7da5 100644 (file)
--- a/lock.c
+++ b/lock.c
@@ -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);