Use new-style system-id macros everywhere possible. I hope I haven't

[openssl.git] / crypto / err / err.c

diff --git a/crypto/err/err.c b/crypto/err/err.c
index fdf774694810c23684e33d223eaa679c0ddf47d4..4f7a2ce4ac7c5988407830b220aedaff5a4e695b 100644 (file)
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -135,7 +135,7 @@ static unsigned long get_error_values(int inc,const char **file,int *line,
                                      const char **data,int *flags);
 
 static void ERR_STATE_free(ERR_STATE *s);
-#ifndef NO_ERR
+#ifndef OPENSSL_NO_ERR
 static ERR_STRING_DATA ERR_str_libraries[]=
        {
 {ERR_PACK(ERR_LIB_NONE,0,0)            ,"unknown library"},
@@ -177,7 +177,7 @@ static ERR_STRING_DATA ERR_str_functs[]=
        {ERR_PACK(0,SYS_F_BIND,0),              "bind"},
        {ERR_PACK(0,SYS_F_LISTEN,0),            "listen"},
        {ERR_PACK(0,SYS_F_ACCEPT,0),            "accept"},
-#ifdef WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
        {ERR_PACK(0,SYS_F_WSASTARTUP,0),        "WSAstartup"},
 #endif
        {ERR_PACK(0,SYS_F_OPENDIR,0),           "opendir"},
@@ -306,7 +306,7 @@ void ERR_load_ERR_strings(void)
                        }
                CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
 
-#ifndef NO_ERR
+#ifndef OPENSSL_NO_ERR
                ERR_load_strings(0,ERR_str_libraries);
                ERR_load_strings(0,ERR_str_reasons);
                ERR_load_strings(ERR_LIB_SYS,ERR_str_functs);