X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=include%2Finternal%2Fconf.h;h=29bc9f963c91d24de38f4b393f5453d72a9ea3a3;hp=8f3e09c896cf537dd618861b1f44b0b2e01d9cb5;hb=72a7a7021fa8bc82a11bc08bac1b0241a92143d0;hpb=21dcbebc6e35419f1842f39a125374ea1ba45693

diff --git a/include/internal/conf.h b/include/internal/conf.h
index 8f3e09c896..29bc9f963c 100644
--- a/include/internal/conf.h
+++ b/include/internal/conf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,21 +12,19 @@
 
 #include <openssl/conf.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+#define DEFAULT_CONF_MFLAGS \
+    (CONF_MFLAGS_DEFAULT_SECTION | \
+     CONF_MFLAGS_IGNORE_MISSING_FILE | \
+     CONF_MFLAGS_IGNORE_RETURN_CODES)
 
 struct ossl_init_settings_st {
-    char *config_name;
+    char *filename;
+    char *appname;
+    unsigned long flags;
 };
 
-void openssl_config_int(const char *config_name);
+int openssl_config_int(const OPENSSL_INIT_SETTINGS *);
 void openssl_no_config_int(void);
 void conf_modules_free_int(void);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif