remove more cases of MS_STATIC, MS_CALLBACK, and MS_FAR. Did you

know that MS_STATIC doesn't mean it is static?  How far can lies
and half-truths be layered?  I wonder if anyone got fooled, and
actually returned a pointer..
ok beck

20 files changed, 60 insertions, 68 deletions

diff --git a/src/lib/libssl/src/apps/apps.c b/src/lib/libssl/src/apps/apps.c
index b76db10a5e..b517c47692 100644
--- a/src/lib/libssl/src/apps/apps.c
+++ b/src/lib/libssl/src/apps/apps.c
@@ -1590,7 +1590,7 @@ BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai)
         {
         BIO *in=NULL;
         BIGNUM *ret=NULL;
-        MS_STATIC char buf[1024];
+        char buf[1024];
         ASN1_INTEGER *ai=NULL;
 
         ai=ASN1_INTEGER_new();
diff --git a/src/lib/libssl/src/apps/ca.c b/src/lib/libssl/src/apps/ca.c
index 55dea95ac1..b07cf97256 100644
--- a/src/lib/libssl/src/apps/ca.c
+++ b/src/lib/libssl/src/apps/ca.c
@@ -318,7 +318,7 @@ int MAIN(int argc, char **argv)
         STACK_OF(OPENSSL_STRING) *sigopts = NULL;
 #undef BSIZE
 #define BSIZE 256
-        MS_STATIC char buf[3][BSIZE];
+        char buf[3][BSIZE];
         char *randfile=NULL;
 #ifndef OPENSSL_NO_ENGINE
         char *engine = NULL;
diff --git a/src/lib/libssl/src/apps/dhparam.c b/src/lib/libssl/src/apps/dhparam.c
index 1297d6fb5e..93bab90b72 100644
--- a/src/lib/libssl/src/apps/dhparam.c
+++ b/src/lib/libssl/src/apps/dhparam.c
@@ -143,7 +143,7 @@
  * -C
  */
 
-static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
+static int dh_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
@@ -534,7 +534,7 @@ end:
         }
 
 /* dh_cb is identical to dsa_cb in apps/dsaparam.c */
-static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
+static int dh_cb(int p, int n, BN_GENCB *cb)
         {
         char c='*';
 
diff --git a/src/lib/libssl/src/apps/dsaparam.c b/src/lib/libssl/src/apps/dsaparam.c
index 683d51391b..ad609fd6c0 100644
--- a/src/lib/libssl/src/apps/dsaparam.c
+++ b/src/lib/libssl/src/apps/dsaparam.c
@@ -105,7 +105,7 @@ static void timebomb_sigalarm(int foo)
 
 #endif
 
-static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb);
+static int dsa_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
@@ -458,7 +458,7 @@ end:
         OPENSSL_EXIT(ret);
         }
 
-static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb)
+static int dsa_cb(int p, int n, BN_GENCB *cb)
         {
         char c='*';
 
diff --git a/src/lib/libssl/src/apps/gendh.c b/src/lib/libssl/src/apps/gendh.c
index 4ec776ba93..6ef7eb9493 100644
--- a/src/lib/libssl/src/apps/gendh.c
+++ b/src/lib/libssl/src/apps/gendh.c
@@ -82,7 +82,7 @@
 #undef PROG
 #define PROG gendh_main
 
-static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
+static int dh_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
@@ -217,7 +217,7 @@ end:
         OPENSSL_EXIT(ret);
         }
 
-static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
+static int dh_cb(int p, int n, BN_GENCB *cb)
         {
         char c='*';
 
diff --git a/src/lib/libssl/src/apps/genrsa.c b/src/lib/libssl/src/apps/genrsa.c
index ece114c876..d3064b663a 100644
--- a/src/lib/libssl/src/apps/genrsa.c
+++ b/src/lib/libssl/src/apps/genrsa.c
@@ -82,7 +82,7 @@
 #undef PROG
 #define PROG genrsa_main
 
-static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb);
+static int genrsa_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
@@ -311,7 +311,7 @@ err:
         OPENSSL_EXIT(ret);
         }
 
-static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb)
+static int genrsa_cb(int p, int n, BN_GENCB *cb)
         {
         char c='*';
 
diff --git a/src/lib/libssl/src/apps/openssl.c b/src/lib/libssl/src/apps/openssl.c
index 71e1e48ece..e40be80db3 100644
--- a/src/lib/libssl/src/apps/openssl.c
+++ b/src/lib/libssl/src/apps/openssl.c
@@ -228,8 +228,8 @@ int main(int Argc, char *ARGV[])
 #define PROG_NAME_SIZE  39
         char pname[PROG_NAME_SIZE+1];
         FUNCTION f,*fp;
-        MS_STATIC const char *prompt;
-        MS_STATIC char buf[1024];
+        const char *prompt;
+        char buf[1024];
         char *to_free=NULL;
         int n,i,ret=0;
         int argc;
@@ -696,13 +696,13 @@ static void list_md(BIO *out)
         EVP_MD_do_all_sorted(list_md_fn, out);
         }
 
-static int MS_CALLBACK function_cmp(const FUNCTION *a, const FUNCTION *b)
+static int function_cmp(const FUNCTION *a, const FUNCTION *b)
         {
         return strncmp(a->name,b->name,8);
         }
 static IMPLEMENT_LHASH_COMP_FN(function, FUNCTION)
 
-static unsigned long MS_CALLBACK function_hash(const FUNCTION *a)
+static unsigned long function_hash(const FUNCTION *a)
         {
         return lh_strhash(a->name);
         }       
diff --git a/src/lib/libssl/src/apps/req.c b/src/lib/libssl/src/apps/req.c
index 5e034a85e8..8e2cc4d196 100644
--- a/src/lib/libssl/src/apps/req.c
+++ b/src/lib/libssl/src/apps/req.c
@@ -1444,7 +1444,7 @@ static int add_DN_object(X509_NAME *n, char *text, const char *def, char *value,
              int nid, int n_min, int n_max, unsigned long chtype, int mval)
         {
         int i,ret=0;
-        MS_STATIC char buf[1024];
+        char buf[1024];
 start:
         if (!batch) BIO_printf(bio_err,"%s [%s]:",text,def);
         (void)BIO_flush(bio_err);
diff --git a/src/lib/libssl/src/apps/s_apps.h b/src/lib/libssl/src/apps/s_apps.h
index 757d3f3d9e..08f55d53d3 100644
--- a/src/lib/libssl/src/apps/s_apps.h
+++ b/src/lib/libssl/src/apps/s_apps.h
@@ -150,7 +150,7 @@ typedef fd_mask fd_set;
 
 int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
 #ifdef HEADER_X509_H
-int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
+int verify_callback(int ok, X509_STORE_CTX *ctx);
 #endif
 #ifdef HEADER_SSL_H
 int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
@@ -161,16 +161,16 @@ int should_retry(int i);
 int extract_port(char *str, short *port_ptr);
 int extract_host_port(char *str,char **host_ptr,unsigned char *ip,char **p);
 
-long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
+long bio_dump_callback(BIO *bio, int cmd, const char *argp,
                                    int argi, long argl, long ret);
 
 #ifdef HEADER_SSL_H
-void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret);
-void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg);
-void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
+void apps_ssl_info_callback(const SSL *s, int where, int ret);
+void msg_cb(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg);
+void tlsext_cb(SSL *s, int client_server, int type,
                                         unsigned char *data, int len,
                                         void *arg);
 #endif
 
-int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned int *cookie_len);
-int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned int cookie_len);
+int generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned int *cookie_len);
+int verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned int cookie_len);
diff --git a/src/lib/libssl/src/apps/s_cb.c b/src/lib/libssl/src/apps/s_cb.c
index 84c3b447c2..4e9b733543 100644
--- a/src/lib/libssl/src/apps/s_cb.c
+++ b/src/lib/libssl/src/apps/s_cb.c
@@ -130,7 +130,7 @@ int verify_return_error=0;
 unsigned char cookie_secret[COOKIE_SECRET_LENGTH];
 int cookie_initialized=0;
 
-int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx)
+int verify_callback(int ok, X509_STORE_CTX *ctx)
         {
         X509 *err_cert;
         int err,depth;
@@ -278,7 +278,7 @@ int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key)
         return 1;
         }
 
-long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
+long bio_dump_callback(BIO *bio, int cmd, const char *argp,
                                    int argi, long argl, long ret)
         {
         BIO *out;
@@ -302,7 +302,7 @@ long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
         return(ret);
         }
 
-void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret)
+void apps_ssl_info_callback(const SSL *s, int where, int ret)
         {
         const char *str;
         int w;
@@ -339,7 +339,7 @@ void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret)
         }
 
 
-void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg)
+void msg_cb(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg)
         {
         BIO *bio = arg;
         const char *str_write_p, *str_version, *str_content_type = "", *str_details1 = "", *str_details2= "";
@@ -655,7 +655,7 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
         (void)BIO_flush(bio);
         }
 
-void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
+void tlsext_cb(SSL *s, int client_server, int type,
                                         unsigned char *data, int len,
                                         void *arg)
         {
@@ -760,7 +760,7 @@ void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
         (void)BIO_flush(bio);
         }
 
-int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned int *cookie_len)
+int generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned int *cookie_len)
         {
         unsigned char *buffer, result[EVP_MAX_MD_SIZE];
         unsigned int length, resultlength;
@@ -848,7 +848,7 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
         return 1;
         }
 
-int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned int cookie_len)
+int verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned int cookie_len)
         {
         unsigned char *buffer, result[EVP_MAX_MD_SIZE];
         unsigned int length, resultlength;
diff --git a/src/lib/libssl/src/apps/s_client.c b/src/lib/libssl/src/apps/s_client.c
index eb8b8eef67..7559dfc113 100644
--- a/src/lib/libssl/src/apps/s_client.c
+++ b/src/lib/libssl/src/apps/s_client.c
@@ -386,7 +386,7 @@ typedef struct tlsextctx_st {
 } tlsextctx;
 
 
-static int MS_CALLBACK ssl_servername_cb(SSL *s, int *ad, void *arg)
+static int ssl_servername_cb(SSL *s, int *ad, void *arg)
         {
         tlsextctx * p = (tlsextctx *) arg;
         const char * hn= SSL_get_servername(s, TLSEXT_NAMETYPE_host_name);
@@ -456,7 +456,7 @@ static int srp_Verify_N_and_g(BIGNUM *N, BIGNUM *g)
    primality tests are rather cpu consuming.
 */
 
-static int MS_CALLBACK ssl_srp_verify_param_cb(SSL *s, void *arg)
+static int ssl_srp_verify_param_cb(SSL *s, void *arg)
         {
         SRP_ARG *srp_arg = (SRP_ARG *)arg;
         BIGNUM *N = NULL, *g = NULL;
@@ -491,7 +491,7 @@ static int MS_CALLBACK ssl_srp_verify_param_cb(SSL *s, void *arg)
 
 #define PWD_STRLEN 1024
 
-static char * MS_CALLBACK ssl_give_srp_client_pwd_cb(SSL *s, void *arg)
+static char * ssl_give_srp_client_pwd_cb(SSL *s, void *arg)
         {
         SRP_ARG *srp_arg = (SRP_ARG *)arg;
         char *pass = (char *)OPENSSL_malloc(PWD_STRLEN+1);
diff --git a/src/lib/libssl/src/apps/s_server.c b/src/lib/libssl/src/apps/s_server.c
index 8198d7f065..a36b1a3ad6 100644
--- a/src/lib/libssl/src/apps/s_server.c
+++ b/src/lib/libssl/src/apps/s_server.c
@@ -202,7 +202,7 @@ typedef unsigned int u_int;
 #endif
 
 #ifndef OPENSSL_NO_RSA
-static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength);
+static RSA *tmp_rsa_cb(SSL *s, int is_export, int keylength);
 #endif
 static int sv_body(char *hostname, int s, unsigned char *context);
 static int www_body(char *hostname, int s, unsigned char *context);
@@ -392,7 +392,7 @@ typedef struct srpsrvparm_st
    (which would normally occur after a worker has finished) and we
    set the user parameters. 
 */
-static int MS_CALLBACK ssl_srp_server_param_cb(SSL *s, int *ad, void *arg)
+static int ssl_srp_server_param_cb(SSL *s, int *ad, void *arg)
         {
         srpsrvparm *p = (srpsrvparm *)arg;
         if (p->login == NULL && p->user == NULL )
@@ -727,7 +727,7 @@ typedef struct tlsextctx_st {
 } tlsextctx;
 
 
-static int MS_CALLBACK ssl_servername_cb(SSL *s, int *ad, void *arg)
+static int ssl_servername_cb(SSL *s, int *ad, void *arg)
         {
         tlsextctx * p = (tlsextctx *) arg;
         const char * servername = SSL_get_servername(s, TLSEXT_NAMETYPE_host_name);
@@ -2386,7 +2386,7 @@ static int init_ssl_connection(SSL *con)
         const char *str;
         X509 *peer;
         long verify_error;
-        MS_STATIC char buf[BUFSIZ];
+        char buf[BUFSIZ];
 #ifndef OPENSSL_NO_KRB5
         char *client_princ;
 #endif
@@ -2956,7 +2956,7 @@ err:
         }
 
 #ifndef OPENSSL_NO_RSA
-static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength)
+static RSA *tmp_rsa_cb(SSL *s, int is_export, int keylength)
         {
         BIGNUM *bn = NULL;
         static RSA *rsa_tmp=NULL;
diff --git a/src/lib/libssl/src/apps/s_time.c b/src/lib/libssl/src/apps/s_time.c
index b823c33c58..6d78afefd2 100644
--- a/src/lib/libssl/src/apps/s_time.c
+++ b/src/lib/libssl/src/apps/s_time.c
@@ -340,7 +340,7 @@ int MAIN(int argc, char **argv)
         SSL *scon=NULL;
         long finishtime=0;
         int ret=1,i;
-        MS_STATIC char buf[1024*8];
+        char buf[1024*8];
         int ver;
 
         apps_startup();
diff --git a/src/lib/libssl/src/apps/ts.c b/src/lib/libssl/src/apps/ts.c
index 5fa9f7fda0..e066a497ca 100644
--- a/src/lib/libssl/src/apps/ts.c
+++ b/src/lib/libssl/src/apps/ts.c
@@ -103,7 +103,7 @@ static TS_RESP *read_PKCS7(BIO *in_bio);
 static TS_RESP *create_response(CONF *conf, const char *section, char *engine,
                                 char *queryfile, char *passin, char *inkey,
                                 char *signer, char *chain, const char *policy);
-static ASN1_INTEGER * MS_CALLBACK serial_cb(TS_RESP_CTX *ctx, void *data);
+static ASN1_INTEGER * serial_cb(TS_RESP_CTX *ctx, void *data);
 static ASN1_INTEGER *next_serial(const char *serialfile);
 static int save_ts_serial(const char *serialfile, ASN1_INTEGER *serial);
 
@@ -116,7 +116,7 @@ static TS_VERIFY_CTX *create_verify_ctx(char *data, char *digest,
                                         char *ca_path, char *ca_file,
                                         char *untrusted);
 static X509_STORE *create_cert_store(char *ca_path, char *ca_file);
-static int MS_CALLBACK verify_cb(int ok, X509_STORE_CTX *ctx);
+static int verify_cb(int ok, X509_STORE_CTX *ctx);
 
 /* Main function definition. */
 int MAIN(int, char **);
@@ -875,7 +875,7 @@ static TS_RESP *create_response(CONF *conf, const char *section, char *engine,
         return response;
         }
 
-static ASN1_INTEGER * MS_CALLBACK serial_cb(TS_RESP_CTX *ctx, void *data)
+static ASN1_INTEGER * serial_cb(TS_RESP_CTX *ctx, void *data)
         {
         const char *serial_file = (const char *) data;
         ASN1_INTEGER *serial = next_serial(serial_file);
@@ -1127,7 +1127,7 @@ static X509_STORE *create_cert_store(char *ca_path, char *ca_file)
         return NULL;
         }
 
-static int MS_CALLBACK verify_cb(int ok, X509_STORE_CTX *ctx)
+static int verify_cb(int ok, X509_STORE_CTX *ctx)
         {
         /*
         char buf[256];
diff --git a/src/lib/libssl/src/apps/verify.c b/src/lib/libssl/src/apps/verify.c
index 893670ff41..ea1a2e6fd9 100644
--- a/src/lib/libssl/src/apps/verify.c
+++ b/src/lib/libssl/src/apps/verify.c
@@ -69,7 +69,7 @@
 #undef PROG
 #define PROG    verify_main
 
-static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx);
+static int cb(int ok, X509_STORE_CTX *ctx);
 static int check(X509_STORE *ctx, char *file,
                 STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
                 STACK_OF(X509_CRL) *crls, ENGINE *e);
@@ -308,7 +308,7 @@ end:
         return(ret);
         }
 
-static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx)
+static int cb(int ok, X509_STORE_CTX *ctx)
         {
         int cert_error = X509_STORE_CTX_get_error(ctx);
         X509 *current_cert = X509_STORE_CTX_get_current_cert(ctx);
diff --git a/src/lib/libssl/src/apps/x509.c b/src/lib/libssl/src/apps/x509.c
index 3863ab968d..0cee89eea1 100644
--- a/src/lib/libssl/src/apps/x509.c
+++ b/src/lib/libssl/src/apps/x509.c
@@ -153,7 +153,7 @@ static const char *x509_usage[]={
 NULL
 };
 
-static int MS_CALLBACK callb(int ok, X509_STORE_CTX *ctx);
+static int callb(int ok, X509_STORE_CTX *ctx);
 static int sign (X509 *x, EVP_PKEY *pkey,int days,int clrext, const EVP_MD *digest,
                                                 CONF *conf, char *section);
 static int x509_certify (X509_STORE *ctx,char *CAfile,const EVP_MD *digest,
@@ -1219,7 +1219,7 @@ end:
         return ret;
         }
 
-static int MS_CALLBACK callb(int ok, X509_STORE_CTX *ctx)
+static int callb(int ok, X509_STORE_CTX *ctx)
         {
         int err;
         X509 *err_cert;
diff --git a/src/lib/libssl/src/demos/selfsign.c b/src/lib/libssl/src/demos/selfsign.c
index 68904c611e..f306d8d8a4 100644
--- a/src/lib/libssl/src/demos/selfsign.c
+++ b/src/lib/libssl/src/demos/selfsign.c
@@ -42,15 +42,7 @@ int main()
         return(0);
         }
 
-#ifdef WIN16
-#  define MS_CALLBACK   _far _loadds
-#  define MS_FAR        _far
-#else
-#  define MS_CALLBACK
-#  define MS_FAR
-#endif
-
-static void MS_CALLBACK callback(p, n, arg)
+static void callback(p, n, arg)
 int p;
 int n;
 void *arg;
diff --git a/src/lib/libssl/src/ssl/s3_lib.c b/src/lib/libssl/src/ssl/s3_lib.c
index c4ef2738d7..6b2739161d 100644
--- a/src/lib/libssl/src/ssl/s3_lib.c
+++ b/src/lib/libssl/src/ssl/s3_lib.c
@@ -3082,7 +3082,7 @@ void ssl3_clear(SSL *s)
         }
 
 #ifndef OPENSSL_NO_SRP
-static char * MS_CALLBACK srp_password_from_info_cb(SSL *s, void *arg)
+static char * srp_password_from_info_cb(SSL *s, void *arg)
         {
         return BUF_strdup(s->srp_ctx.info) ;
         }
diff --git a/src/lib/libssl/src/ssl/ssl_task.c b/src/lib/libssl/src/ssl/ssl_task.c
index b5ce44b47c..416fb16743 100644
--- a/src/lib/libssl/src/ssl/ssl_task.c
+++ b/src/lib/libssl/src/ssl/ssl_task.c
@@ -131,7 +131,7 @@ int LIB$INIT_TIMER(), LIB$SHOW_TIMER();
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
-int MS_CALLBACK verify_callback(int ok, X509 *xs, X509 *xi, int depth,
+int verify_callback(int ok, X509 *xs, X509 *xi, int depth,
         int error);
 BIO *bio_err=NULL;
 BIO *bio_stdout=NULL;
diff --git a/src/lib/libssl/src/ssl/ssltest.c b/src/lib/libssl/src/ssl/ssltest.c
index 4f80be8ee4..8a602cc551 100644
--- a/src/lib/libssl/src/ssl/ssltest.c
+++ b/src/lib/libssl/src/ssl/ssltest.c
@@ -217,12 +217,12 @@
 #define COMP_RLE        255
 #define COMP_ZLIB       1
 
-static int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
+static int verify_callback(int ok, X509_STORE_CTX *ctx);
 #ifndef OPENSSL_NO_RSA
-static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export,int keylength);
+static RSA *tmp_rsa_cb(SSL *s, int is_export,int keylength);
 static void free_tmp_rsa(void);
 #endif
-static int MS_CALLBACK app_verify_callback(X509_STORE_CTX *ctx, void *arg);
+static int app_verify_callback(X509_STORE_CTX *ctx, void *arg);
 #define APP_CALLBACK_STRING "Test Callback Argument"
 struct app_verify_arg
         {
@@ -260,7 +260,7 @@ typedef struct srp_client_arg_st
 
 #define PWD_STRLEN 1024
 
-static char * MS_CALLBACK ssl_give_srp_client_pwd_cb(SSL *s, void *arg)
+static char * ssl_give_srp_client_pwd_cb(SSL *s, void *arg)
         {
         SRP_CLIENT_ARG *srp_client_arg = (SRP_CLIENT_ARG *)arg;
         return BUF_strdup((char *)srp_client_arg->srppassin);
@@ -274,7 +274,7 @@ typedef struct srp_server_arg_st
         char *pass;
         } SRP_SERVER_ARG;
 
-static int MS_CALLBACK ssl_srp_server_param_cb(SSL *s, int *ad, void *arg)
+static int ssl_srp_server_param_cb(SSL *s, int *ad, void *arg)
         {
         SRP_SERVER_ARG * p = (SRP_SERVER_ARG *) arg;
 
@@ -1230,7 +1230,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
                         {
                         /* CLIENT */
                 
-                        MS_STATIC char cbuf[1024*8];
+                        char cbuf[1024*8];
                         int i, r;
                         clock_t c_clock = clock();
 
@@ -1316,7 +1316,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
                         {
                         /* SERVER */
                 
-                        MS_STATIC char sbuf[1024*8];
+                        char sbuf[1024*8];
                         int i, r;
                         clock_t s_clock = clock();
 
@@ -1550,7 +1550,7 @@ end:
 
 int doit(SSL *s_ssl, SSL *c_ssl, long count)
         {
-        MS_STATIC char cbuf[1024*8],sbuf[1024*8];
+        char cbuf[1024*8],sbuf[1024*8];
         long cw_num=count,cr_num=count;
         long sw_num=count,sr_num=count;
         int ret=1;
@@ -1858,7 +1858,7 @@ static int get_proxy_auth_ex_data_idx(void)
         return idx;
         }
 
-static int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx)
+static int verify_callback(int ok, X509_STORE_CTX *ctx)
         {
         char *s,buf[256];
 
@@ -2232,7 +2232,7 @@ static int process_proxy_cond(unsigned int letters[26],
         return process_proxy_cond_adders(letters, cond, cond_end, &pos, 1);
         }
 
-static int MS_CALLBACK app_verify_callback(X509_STORE_CTX *ctx, void *arg)
+static int app_verify_callback(X509_STORE_CTX *ctx, void *arg)
         {
         int ok=1;
         struct app_verify_arg *cb_arg = arg;
@@ -2326,7 +2326,7 @@ static int MS_CALLBACK app_verify_callback(X509_STORE_CTX *ctx, void *arg)
 #ifndef OPENSSL_NO_RSA
 static RSA *rsa_tmp=NULL;
 
-static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength)
+static RSA *tmp_rsa_cb(SSL *s, int is_export, int keylength)
         {
         BIGNUM *bn = NULL;
         if (rsa_tmp == NULL)