Use C syntax, not FORTRAN or whatever that was :-)

[openssl.git] / ssl / s2_meth.c

diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c
index f28c9162cff4357943d63064e2fa226cb455234e..deb9e1d6f36c316fdd1b005916c74540a05130e4 100644 (file)
--- a/ssl/s2_meth.c
+++ b/ssl/s2_meth.c
@@ -56,18 +56,13 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
-#include "objects.h"
 #include "ssl_locl.h"
+#ifndef NO_SSL2
+#include <stdio.h>
+#include <openssl/objects.h>
 
-#ifndef NOPROTO
 static SSL_METHOD *ssl2_get_method(int ver);
-#else
-static SSL_METHOD *ssl2_get_method();
-#endif
-
-static SSL_METHOD *ssl2_get_method(ver)
-int ver;
+static SSL_METHOD *ssl2_get_method(int ver)
        {
        if (ver == SSL2_VERSION)
                return(SSLv2_method());
@@ -75,20 +70,26 @@ int ver;
                return(NULL);
        }
 
-SSL_METHOD *SSLv2_method()
+SSL_METHOD *SSLv2_method(void)
        {
        static int init=1;
        static SSL_METHOD SSLv2_data;
 
        if (init)
                {
-               init=0;
                memcpy((char *)&SSLv2_data,(char *)sslv2_base_method(),
                        sizeof(SSL_METHOD));
                SSLv2_data.ssl_connect=ssl2_connect;
                SSLv2_data.ssl_accept=ssl2_accept;
                SSLv2_data.get_ssl_method=ssl2_get_method;
+               init=0;
                }
        return(&SSLv2_data);
        }
+#else /* !NO_SSL2 */
 
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
+#endif