diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-01-23 11:58:26 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-01-23 11:58:26 -0500 |
| commit | 68b00c237298b2e7e382686ffd583847d57bbc0b (patch) | |
| tree | f0728a99d3d978a6268e715564401ae68e65167b /apps | |
| parent | 9b05cbc33e7895ed033b1119e300782d9e0cf23c (diff) | |
ifdef cleanup part 3: OPENSSL_SYSNAME
Rename OPENSSL_SYSNAME_xxx to OPENSSL_SYS_xxx
Remove MS_STATIC; it's a relic from platforms <32 bits.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/apps.c | 4 | ||||
| -rw-r--r-- | apps/apps.h | 2 | ||||
| -rw-r--r-- | apps/ca.c | 2 | ||||
| -rw-r--r-- | apps/openssl.c | 4 | ||||
| -rw-r--r-- | apps/req.c | 2 | ||||
| -rw-r--r-- | apps/s_server.c | 2 | ||||
| -rw-r--r-- | apps/s_time.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/apps/apps.c b/apps/apps.c index ccd218260d..97f0c0e182 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -119,7 +119,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#if !defined(OPENSSL_SYSNAME_WIN32) && !defined(OPENSSL_SYSNAME_WINCE) && !defined(NETWARE_CLIB) +#if !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_WINCE) && !defined(NETWARE_CLIB) # include <strings.h> #endif #include <sys/types.h> @@ -1631,7 +1631,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/apps/apps.h b/apps/apps.h index 22c678af30..3f53bc1b14 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -205,7 +205,7 @@ extern BIO *bio_err; # endif # endif -# if defined(OPENSSL_SYSNAME_WIN32) || defined(OPENSSL_SYSNAME_WINCE) +# if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE) # define openssl_fdset(a,b) FD_SET((unsigned int)a, b) # else # define openssl_fdset(a,b) FD_SET(a, b) @@ -323,7 +323,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/apps/openssl.c b/apps/openssl.c index d8848b59cc..b19628571b 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -221,8 +221,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; diff --git a/apps/req.c b/apps/req.c index 990c5bdea0..6d06ed74a7 100644 --- a/apps/req.c +++ b/apps/req.c @@ -1354,7 +1354,7 @@ static int add_DN_object(X509_NAME *n, char *text, const char *def, 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); diff --git a/apps/s_server.c b/apps/s_server.c index 94de734e5c..4dae4d5271 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -2557,7 +2557,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 diff --git a/apps/s_time.c b/apps/s_time.c index 352040873f..972dccff2c 100644 --- a/apps/s_time.c +++ b/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(); |