RT3548: Remove unsupported platforms

[openssl.git] / apps / x509.c

diff --git a/apps/x509.c b/apps/x509.c
index 1b612d17d41d01ebbfd921654b12dac664225563..b3c23907bf74966996b1318a56ab4d7533c5a9b6 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -60,9 +60,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
-#endif
 #include "apps.h"
 #include <openssl/bio.h>
 #include <openssl/asn1.h>
@@ -156,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,
@@ -214,7 +211,8 @@ int MAIN(int argc, char **argv)
        int need_rand = 0;
        int checkend=0,checkoffset=0;
        unsigned long nmflag = 0, certflag = 0;
-       unsigned char *checkhost = NULL, *checkemail = NULL;
+       char *checkhost = NULL;
+       char *checkemail = NULL;
        char *checkip = NULL;
 #ifndef OPENSSL_NO_ENGINE
        char *engine=NULL;
@@ -474,12 +472,12 @@ int MAIN(int argc, char **argv)
                else if (strcmp(*argv,"-checkhost") == 0)
                        {
                        if (--argc < 1) goto bad;
-                       checkhost=(unsigned char *)*(++argv);
+                       checkhost=*(++argv);
                        }
                else if (strcmp(*argv,"-checkemail") == 0)
                        {
                        if (--argc < 1) goto bad;
-                       checkemail=(unsigned char *)*(++argv);
+                       checkemail=*(++argv);
                        }
                else if (strcmp(*argv,"-checkip") == 0)
                        {
@@ -1278,7 +1276,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;