Do you really want to build OpenSSL for 16-bit Windows? Well, we don't.

ok miod@

diff --git a/lib/libcrypto/txt_db/txt_db.c b/lib/libcrypto/txt_db/txt_db.c
index 69fd2ba..a2afa3d 100644 (file)
--- a/lib/libcrypto/txt_db/txt_db.c
+++ b/lib/libcrypto/txt_db/txt_db.c
@@ -157,17 +157,13 @@ TXT_DB_read(BIO *in, int num)
                }
                *(p++)='\0';
                if ((n != num) || (*f != '\0')) {
-#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)  /* temporary fix :-( */
                        fprintf(stderr, "wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f);
-#endif
                        er = 2;
                        goto err;
                }
                pp[n] = p;
                if (!sk_OPENSSL_PSTRING_push(ret->data, pp)) {
-#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)  /* temporary fix :-( */
                        fprintf(stderr, "failure in sk_push\n");
-#endif
                        er = 2;
                        goto err;
                }
@@ -177,10 +173,8 @@ TXT_DB_read(BIO *in, int num)
 err:
        BUF_MEM_free(buf);
        if (er) {
-#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)
                if (er == 1)
                        fprintf(stderr, "malloc failure\n");
-#endif
                if (ret != NULL) {
                        if (ret->data != NULL)
                                sk_OPENSSL_PSTRING_free(ret->data);

diff --git a/lib/libssl/src/crypto/txt_db/txt_db.c b/lib/libssl/src/crypto/txt_db/txt_db.c
index 69fd2ba..a2afa3d 100644 (file)
--- a/lib/libssl/src/crypto/txt_db/txt_db.c
+++ b/lib/libssl/src/crypto/txt_db/txt_db.c
@@ -157,17 +157,13 @@ TXT_DB_read(BIO *in, int num)
                }
                *(p++)='\0';
                if ((n != num) || (*f != '\0')) {
-#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)  /* temporary fix :-( */
                        fprintf(stderr, "wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f);
-#endif
                        er = 2;
                        goto err;
                }
                pp[n] = p;
                if (!sk_OPENSSL_PSTRING_push(ret->data, pp)) {
-#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)  /* temporary fix :-( */
                        fprintf(stderr, "failure in sk_push\n");
-#endif
                        er = 2;
                        goto err;
                }
@@ -177,10 +173,8 @@ TXT_DB_read(BIO *in, int num)
 err:
        BUF_MEM_free(buf);
        if (er) {
-#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)
                if (er == 1)
                        fprintf(stderr, "malloc failure\n");
-#endif
                if (ret != NULL) {
                        if (ret->data != NULL)
                                sk_OPENSSL_PSTRING_free(ret->data);