From: Geoff Thorpe <geoff@openssl.org>
Date: Wed, 29 Oct 2003 22:25:04 +0000 (+0000)
Subject: Oops, this file already had the "empty source file" workaround but it
X-Git-Tag: BEN_FIPS_TEST_4^2~11^2~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06e4024d98a8e142e354619a844c51429ed94bb6;p=thirdparty%2Fopenssl.git

Oops, this file already had the "empty source file" workaround but it
requires -DPEDANTIC and was hidden at the bottom of the file. This moves it
to the top and removes the redundant declaration.
---

diff --git a/crypto/ebcdic.c b/crypto/ebcdic.c
index 6ac5b394436..43e53bcaf7d 100644
--- a/crypto/ebcdic.c
+++ b/crypto/ebcdic.c
@@ -1,8 +1,14 @@
 /* crypto/ebcdic.c */
 
+#ifndef CHARSET_EBCDIC
+
+#include <openssl/e_os2.h>
+#if defined(PEDANTIC) || defined(__DECC) || defined(OPENSSL_SYS_MACOSX)
 static void *dummy=&dummy;
+#endif
+
+#else /*CHARSET_EBCDIC*/
 
-#ifdef CHARSET_EBCDIC
 #include "ebcdic.h"
 /*      Initial Port for  Apache-1.3     by <Martin.Kraemer@Mch.SNI.De>
  *      Adapted for       OpenSSL-0.9.4  by <Martin.Kraemer@Mch.SNI.De>
@@ -212,9 +218,4 @@ ascii2ebcdic(void *dest, const void *srce, size_t count)
     return dest;
 }
 
-#else /*CHARSET_EBCDIC*/
-#include <openssl/e_os2.h>
-#if defined(PEDANTIC) || defined(__DECC) || defined(OPENSSL_SYS_MACOSX)
-static void *dummy=&dummy;
-#endif
 #endif