synchronize with engine branch (some changes were done only

[oweals/openssl.git] / crypto / buffer / buf_err.c

diff --git a/crypto/buffer/buf_err.c b/crypto/buffer/buf_err.c
index 5eee653e14d0a7275f3dc8bf8c24a77125d68124..2f971a5f38ba839082b165b8d5357844a3d8edac 100644 (file)
--- a/crypto/buffer/buf_err.c
+++ b/crypto/buffer/buf_err.c
@@ -63,7 +63,7 @@
 #include <openssl/buffer.h>
 
 /* BEGIN ERROR CODES */
-#ifndef OPENSSL_NO_ERR
+#ifndef NO_ERR
 static ERR_STRING_DATA BUF_str_functs[]=
        {
 {ERR_PACK(0,BUF_F_BUF_MEM_GROW,0),     "BUF_MEM_grow"},
@@ -86,7 +86,7 @@ void ERR_load_BUF_strings(void)
        if (init)
                {
                init=0;
-#ifndef OPENSSL_NO_ERR
+#ifndef NO_ERR
                ERR_load_strings(ERR_LIB_BUF,BUF_str_functs);
                ERR_load_strings(ERR_LIB_BUF,BUF_str_reasons);
 #endif