From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 3 Feb 2011 16:16:30 +0000 (+0000)
Subject: Rename crypto/fips_err.c to fips_ers.c to avoid clash with other fips_err.c
X-Git-Tag: OpenSSL-fips-2_0-rc1~794
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3710d1aae915b5d57c60d6862a75789ea107cc49;p=thirdparty%2Fopenssl.git

Rename crypto/fips_err.c to fips_ers.c to avoid clash with other fips_err.c
---

diff --git a/crypto/Makefile b/crypto/Makefile
index 742f731db53..7595cb4578a 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -34,8 +34,8 @@ GENERAL=Makefile README crypto-lib.com install.com
 
 LIB= $(TOP)/libcrypto.a
 SHARED_LIB= libcrypto$(SHLIB_EXT)
-LIBSRC=	cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c ebcdic.c uid.c o_time.c o_str.c o_dir.c thr_id.c lock.c fips_err.c
-LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o uid.o o_time.o o_str.o o_dir.o thr_id.o lock.o fips_err.o $(CPUID_OBJ)
+LIBSRC=	cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c ebcdic.c uid.c o_time.c o_str.c o_dir.c thr_id.c lock.c fips_ers.c
+LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o uid.o o_time.o o_str.o o_dir.o thr_id.o lock.o fips_ers.o $(CPUID_OBJ)
 
 SRC= $(LIBSRC)
 
diff --git a/crypto/fips_ers.c b/crypto/fips_ers.c
new file mode 100644
index 00000000000..09f11748f60
--- /dev/null
+++ b/crypto/fips_ers.c
@@ -0,0 +1,7 @@
+#include <openssl/opensslconf.h>
+
+#ifdef OPENSSL_FIPS
+# include "fips_err.h"
+#else
+static void *dummy=&dummy;
+#endif