summaryrefslogtreecommitdiffstats
path: root/src/include/openssl/conf.h
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2015-09-25 00:26:37 +0000
committerKenny Root <kroot@google.com>2015-09-25 00:26:37 +0000
commita04d78d392463df4e69a64360c952ffa5abd22f7 (patch)
treedc62c249d595198e0d99e43890019d21e901fbec /src/include/openssl/conf.h
parent1e4884f615b20946411a74e41eb9c6aa65e2d5f3 (diff)
downloadexternal_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.zip
external_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.tar.gz
external_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.tar.bz2
Revert "external/boringssl: sync with upstream."
This reverts commit 1e4884f615b20946411a74e41eb9c6aa65e2d5f3. This breaks some x86 builds. Change-Id: I4d4310663ce52bc0a130e6b9dbc22b868ff4fb25
Diffstat (limited to 'src/include/openssl/conf.h')
-rw-r--r--src/include/openssl/conf.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/include/openssl/conf.h b/src/include/openssl/conf.h
index a2741a8..84fc94f 100644
--- a/src/include/openssl/conf.h
+++ b/src/include/openssl/conf.h
@@ -135,6 +135,10 @@ int CONF_parse_list(const char *list, char sep, int remove_whitespace,
} /* extern C */
#endif
+#define CONF_F_CONF_parse_list 100
+#define CONF_F_NCONF_load 101
+#define CONF_F_def_load_bio 102
+#define CONF_F_str_copy 103
#define CONF_R_LIST_CANNOT_BE_NULL 100
#define CONF_R_MISSING_CLOSE_SQUARE_BRACKET 101
#define CONF_R_MISSING_EQUAL_SIGN 102