aboutsummaryrefslogtreecommitdiff
path: root/include/openssl/mem.h
diff options
context:
space:
mode:
authorJoshua Liebow-Feeser <joshlf@google.com>2018-08-26 18:53:36 -0700
committerCQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>2018-09-06 20:07:52 +0000
commit8c7c6356e676a616d7aab9014374c5de69b06615 (patch)
tree59350430b4860a45605264100f42462e893f40a8 /include/openssl/mem.h
parent492c9aa90c97db64fd044898ae0b2a3efccef10e (diff)
downloadboringssl-8c7c6356e676a616d7aab9014374c5de69b06615.zip
boringssl-8c7c6356e676a616d7aab9014374c5de69b06615.tar.gz
boringssl-8c7c6356e676a616d7aab9014374c5de69b06615.tar.bz2
Support symbol prefixes
- In base.h, if BORINGSSL_PREFIX is defined, include boringssl_prefix_symbols.h - In all .S files, if BORINGSSL_PREFIX is defined, include boringssl_prefix_symbols_asm.h - In base.h, BSSL_NAMESPACE_BEGIN and BSSL_NAMESPACE_END are defined with appropriate values depending on whether BORINGSSL_PREFIX is defined; these macros are used in place of 'namespace bssl {' and '}' - Add util/make_prefix_headers.go, which takes a list of symbols and auto-generates the header files mentioned above - In CMakeLists.txt, if BORINGSSL_PREFIX and BORINGSSL_PREFIX_SYMBOLS are defined, run util/make_prefix_headers.go to generate header files - In various CMakeLists.txt files, add "global_target" that all targets depend on to give us a place to hook logic that must run before all other targets (in particular, the header file generation logic) - Document this in BUILDING.md, including the fact that it is the caller's responsibility to provide the symbol list and keep it up to date - Note that this scheme has not been tested on Windows, and likely does not work on it; Windows support will need to be added in a future commit Change-Id: If66a7157f46b5b66230ef91e15826b910cf979a2 Reviewed-on: https://boringssl-review.googlesource.com/31364 Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Reviewed-by: David Benjamin <davidben@google.com>
Diffstat (limited to 'include/openssl/mem.h')
-rw-r--r--include/openssl/mem.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/openssl/mem.h b/include/openssl/mem.h
index 7d7087e..9f9c00d 100644
--- a/include/openssl/mem.h
+++ b/include/openssl/mem.h
@@ -142,12 +142,12 @@ OPENSSL_EXPORT int BIO_vsnprintf(char *buf, size_t n, const char *format,
extern "C++" {
-namespace bssl {
+BSSL_NAMESPACE_BEGIN
BORINGSSL_MAKE_DELETER(char, OPENSSL_free)
BORINGSSL_MAKE_DELETER(uint8_t, OPENSSL_free)
-} // namespace bssl
+BSSL_NAMESPACE_END
} // extern C++