Fix wrong extern declaration of globals in conn/conn_globals.h (#919)

* Revert "Move definition of conn/globals.h back into globals.h (#912)"

This reverts commit fe03e2b126ca899f6fdd8276125bef3c66b6aef4.

* Fix wrong extern definition of globals in conn/conn_globals.h

Issue #918

diff --git a/conn/conn_globals.c b/conn/conn_globals.c
index b8838e2f0a807501e87110919174f787516d6701..2f8ef5115f5a500c974d825a16c0f6a031e1c6d7 100644 (file)
--- a/conn/conn_globals.c
+++ b/conn/conn_globals.c
@@ -40,7 +40,6 @@
 
 #include "config.h"
 
-#if 0
 short ConnectTimeout; /**< Config: $connect_timeout */
 
 #ifdef USE_SSL
@@ -58,4 +57,3 @@ short SslMinDhPrimeBits;           /**< Config: $ssl_min_dh_prime_bits */
 const char *Preconnect; /**< Config: $preconnect */
 const char *Tunnel;     /**< Config: $tunnel */
 #endif                  /* USE_SOCKET */
-#endif

diff --git a/conn/conn_globals.h b/conn/conn_globals.h
index dbcf7e4387b0011b71ea6e43d935740e7e7c3c5b..1b52c0b05551bbc0e4bfb0bae2e69df317dccbff 100644 (file)
--- a/conn/conn_globals.h
+++ b/conn/conn_globals.h
@@ -23,22 +23,22 @@
 #ifndef _CONN_GLOBALS_H
 #define _CONN_GLOBALS_H
 
-extern short ConnectTimeout;
+short ConnectTimeout;
 
 #ifdef USE_SSL
-extern const char *CertificateFile;
-extern const char *EntropyFile;
-extern const char *SslCiphers;
-extern const char *SslClientCert;
+const char *CertificateFile;
+const char *EntropyFile;
+const char *SslCiphers;
+const char *SslClientCert;
 #ifdef USE_SSL_GNUTLS
-extern const char *SslCaCertificatesFile;
-extern short SslMinDhPrimeBits;
+const char *SslCaCertificatesFile;
+short SslMinDhPrimeBits;
 #endif
 #endif
 
 #ifdef USE_SOCKET
-extern const char *Preconnect;
-extern const char *Tunnel;
+const char *Preconnect;
+const char *Tunnel;
 #endif
 
 #endif /* _CONN_GLOBALS_H */

diff --git a/globals.h b/globals.h
index d4a8355b0c8f904a051c89a17f200ac64b41e24c..5fd8e97badac1b06b6f74dc0d17ae729673cb680 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -326,26 +326,6 @@ WHERE int NmQueryWindowCurrentPosition;
 WHERE char *NmQueryWindowCurrentSearch;
 #endif
 
-#if 1
-WHERE short ConnectTimeout;
-
-#ifdef USE_SSL
-WHERE const char *CertificateFile;
-WHERE const char *EntropyFile;
-WHERE const char *SslCiphers;
-WHERE const char *SslClientCert;
-#ifdef USE_SSL_GNUTLS
-WHERE const char *SslCaCertificatesFile;
-WHERE short SslMinDhPrimeBits;
-#endif
-#endif
-
-#ifdef USE_SOCKET
-WHERE const char *Preconnect;
-WHERE const char *Tunnel;
-#endif
-#endif
-
 #ifdef MAIN_C
 const char *const BodyTypes[] = {
     "x-unknown", "audio",     "application", "image", "message",