Wrap the inclusion of openssl/engine.h with a protective check for

[oweals/openssl.git] / crypto / conf / conf_lib.c

diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c
index 7998f34c7b68c487aae1dbe726ef162863eef3a4..a55a5457c634998c070ddc0a7b087230f6d3aa6b 100644 (file)
--- a/crypto/conf/conf_lib.c
+++ b/crypto/conf/conf_lib.c
@@ -184,7 +184,7 @@ long CONF_get_number(LHASH *conf,const char *group,const char *name)
        if (status == 0)
                {
                /* This function does not believe in errors... */
-               ERR_get_error();
+               ERR_clear_error();
                }
        return result;
        }
@@ -382,8 +382,9 @@ int NCONF_dump_bio(const CONF *conf, BIO *out)
        return conf->meth->dump(conf, out);
        }
 
+
 /* This function should be avoided */
-#undef NCONF_get_number
+#if 0
 long NCONF_get_number(CONF *conf,char *group,char *name)
        {
        int status;
@@ -397,4 +398,4 @@ long NCONF_get_number(CONF *conf,char *group,char *name)
                }
        return ret;
        }
-
+#endif