atfork: added underscore to gnutls_forkid

diff --git a/lib/atfork.c b/lib/atfork.c
index 793de391cfc14430a8b07c6f151c4daa0167802c..28aaf70177bf625e2972d6175a1da9fae037c2e2 100644 (file)
--- a/lib/atfork.c
+++ b/lib/atfork.c
@@ -31,14 +31,14 @@
 #include <sys/types.h>
 #include <atfork.h>
 
-unsigned int gnutls_forkid = 0;
+unsigned int _gnutls_forkid = 0;
 
 #ifndef _WIN32
 
 # ifdef HAVE_ATFORK
 static void fork_handler(void)
 {
-       gnutls_forkid++;
+       _gnutls_forkid++;
 }
 # endif
 
@@ -81,7 +81,7 @@ int _gnutls_detect_fork(unsigned int forkid)
 /* we have to detect fork manually */
 int _gnutls_register_fork_handler(void)
 {
-       gnutls_forkid = getpid();
+       _gnutls_forkid = getpid();
        return 0;
 }
 

diff --git a/lib/atfork.h b/lib/atfork.h
index c8768877ff862ae6bcb4f14c40db61393825b5f6..23700fdb7ad957450f0c750659a73c74886d7737 100644 (file)
--- a/lib/atfork.h
+++ b/lib/atfork.h
@@ -26,7 +26,7 @@
 #include <config.h>
 #include <gnutls_int.h>
 
-extern unsigned int gnutls_forkid;
+extern unsigned int _gnutls_forkid;
 
 #if defined(HAVE___REGISTER_ATFORK) || defined(HAVE_PTHREAD_ATFORK)
 # define HAVE_ATFORK
@@ -40,14 +40,14 @@ int _gnutls_register_fork_handler(void); /* global init */
 # if defined(HAVE_ATFORK)
 inline static int _gnutls_detect_fork(unsigned int forkid)
 {
-       if (forkid == gnutls_forkid)
+       if (forkid == _gnutls_forkid)
                return 0;
        return 1;
 }
 
 inline static unsigned int _gnutls_get_forkid(void)
 {
-       return gnutls_forkid;
+       return _gnutls_forkid;
 }
 # else
 int _gnutls_detect_fork(unsigned int forkid);