Update from HEAD.

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index 78308111447fae8c165f69bfa4a775d06381e793..d07a212faceabd612b335bb93e38a5cfd0940271 100644 (file)
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -61,7 +61,7 @@
 #include <openssl/objects.h>
 #include "ssl_locl.h"
 
-const char *dtls1_version_str="DTLSv1" OPENSSL_VERSION_PTEXT;
+const char dtls1_version_str[]="DTLSv1" OPENSSL_VERSION_PTEXT;
 
 SSL3_ENC_METHOD DTLSv1_enc_data={
     dtls1_enc,

diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index def3a6e89afd265ffefcb701949d54eecc52878e..10751b22baf8fe4cfb4abcd794076e025d72e78a 100644 (file)
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -63,7 +63,7 @@
 #include <openssl/evp.h>
 #include <openssl/md5.h>
 
-const char *ssl2_version_str="SSLv2" OPENSSL_VERSION_PTEXT;
+const char ssl2_version_str[]="SSLv2" OPENSSL_VERSION_PTEXT;
 
 #define SSL2_NUM_CIPHERS (sizeof(ssl2_ciphers)/sizeof(SSL_CIPHER))
 

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 0eff243c1298a97f3c0014933464a85e7116fe82..879298a864c523ad846cad56ab19f5fd5fe3e257 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -132,7 +132,7 @@
 #endif
 #include <openssl/pq_compat.h>
 
-const char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT;
+const char ssl3_version_str[]="SSLv3" OPENSSL_VERSION_PTEXT;
 
 #define SSL3_NUM_CIPHERS       (sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER))
 

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index d4516eba71e077e0ffa09fa3ba53b5170ef93fd8..1ecbbcb8fb1fb5a4277261628eaf57096c1c4f71 100644 (file)
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -60,7 +60,7 @@
 #include <openssl/objects.h>
 #include "ssl_locl.h"
 
-const char *tls1_version_str="TLSv1" OPENSSL_VERSION_PTEXT;
+const char tls1_version_str[]="TLSv1" OPENSSL_VERSION_PTEXT;
 
 SSL3_ENC_METHOD TLSv1_enc_data={
        tls1_enc,