X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=ssl%2Fs2_meth.c;h=d30b7179f7cfe0d74c799eab0068ff98a764ef9d;hb=042e57d5628244b121836881c433b6fa2b6f1697;hp=7d7eed8a8f18b77047f404bd7712c47aeec874dd;hpb=6b691a5c85ddc4e407e32781841fee5c029506cd;p=openssl.git

diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c
index 7d7eed8a8f..d30b7179f7 100644
--- a/ssl/s2_meth.c
+++ b/ssl/s2_meth.c
@@ -56,16 +56,12 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
-#include "objects.h"
 #include "ssl_locl.h"
+#ifndef OPENSSL_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(int ver)
 	{
 	if (ver == SSL2_VERSION)
@@ -81,13 +77,19 @@ SSL_METHOD *SSLv2_method(void)
 
 	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 /* !OPENSSL_NO_SSL2 */
 
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
+#endif