From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Fri, 26 Jun 2015 12:47:39 +0000 (+0200)
Subject: atfork: added underscore to gnutls_forkid
X-Git-Tag: gnutls_3_4_3~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0ffc1dcc31b089daedabd46d079061e44ba6367;p=thirdparty%2Fgnutls.git

atfork: added underscore to gnutls_forkid
---

diff --git a/lib/atfork.c b/lib/atfork.c
index 793de391cf..28aaf70177 100644
--- 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 c8768877ff..23700fdb7a 100644
--- 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);