Work with -pedantic!

[openssl.git] / ssl / s3_meth.c

diff --git a/ssl/s3_meth.c b/ssl/s3_meth.c
index 3d66b4643aae60a6ebc5a4b4e9831b4511bb2e6c..d70165cb4006875d634764b1bb2fe43ce50ec2b8 100644 (file)
--- a/ssl/s3_meth.c
+++ b/ssl/s3_meth.c
@@ -60,8 +60,13 @@
 #include "objects.h"
 #include "ssl_locl.h"
 
-static SSL_METHOD *ssl3_get_method(ver)
-int ver;
+#ifndef NOPROTO
+static SSL_METHOD *ssl3_get_method(int ver);
+#else
+static SSL_METHOD *ssl3_get_method();
+#endif
+
+static SSL_METHOD *ssl3_get_method(int ver)
        {
        if (ver == SSL3_VERSION)
                return(SSLv3_method());
@@ -69,19 +74,19 @@ int ver;
                return(NULL);
        }
 
-SSL_METHOD *SSLv3_method()
+SSL_METHOD *SSLv3_method(void)
        {
        static int init=1;
        static SSL_METHOD SSLv3_data;
 
        if (init)
                {
-               init=0;
                memcpy((char *)&SSLv3_data,(char *)sslv3_base_method(),
                        sizeof(SSL_METHOD));
                SSLv3_data.ssl_connect=ssl3_connect;
                SSLv3_data.ssl_accept=ssl3_accept;
                SSLv3_data.get_ssl_method=ssl3_get_method;
+               init=0;
                }
        return(&SSLv3_data);
        }