summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs7/pkcs7err.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2001-02-19 17:06:34 +0100
committerRichard Levitte <levitte@openssl.org>2001-02-19 17:06:34 +0100
commitcf1b7d96647d55e533f779e476e3d4371f40445a (patch)
treef7d6534cf77223190eaefe68d9e192d3d1246206 /crypto/pkcs7/pkcs7err.c
parentRemove temporary files when done. (diff)
downloadopenssl-cf1b7d96647d55e533f779e476e3d4371f40445a.tar.xz
openssl-cf1b7d96647d55e533f779e476e3d4371f40445a.zip
Make all configuration macros available for application by making
sure they are available in opensslconf.h, by giving them names starting with "OPENSSL_" to avoid conflicts with other packages and by making sure e_os2.h will cover all platform-specific cases together with opensslconf.h. I've checked fairly well that nothing breaks with this (apart from external software that will adapt if they have used something like NO_KRB5), but I can't guarantee it completely, so a review of this change would be a good thing.
Diffstat (limited to 'crypto/pkcs7/pkcs7err.c')
-rw-r--r--crypto/pkcs7/pkcs7err.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/pkcs7/pkcs7err.c b/crypto/pkcs7/pkcs7err.c
index 8ded8913db..b69759fa7e 100644
--- a/crypto/pkcs7/pkcs7err.c
+++ b/crypto/pkcs7/pkcs7err.c
@@ -63,7 +63,7 @@
#include <openssl/pkcs7.h>
/* BEGIN ERROR CODES */
-#ifndef NO_ERR
+#ifndef OPENSSL_NO_ERR
static ERR_STRING_DATA PKCS7_str_functs[]=
{
{ERR_PACK(0,PKCS7_F_B64_READ_PKCS7,0), "B64_READ_PKCS7"},
@@ -152,7 +152,7 @@ void ERR_load_PKCS7_strings(void)
if (init)
{
init=0;
-#ifndef NO_ERR
+#ifndef OPENSSL_NO_ERR
ERR_load_strings(ERR_LIB_PKCS7,PKCS7_str_functs);
ERR_load_strings(ERR_LIB_PKCS7,PKCS7_str_reasons);
#endif