remove unneeded local tls.h patch

This commit is contained in:
Brent Cook 2015-06-19 02:09:27 -05:00
parent 9764453937
commit b67c9460ba
2 changed files with 2 additions and 28 deletions

View File

@ -1,25 +0,0 @@
--- include/tls.h.orig 2015-05-23 19:18:30.002576267 -0500
+++ include/tls.h 2015-05-23 19:18:09.830576581 -0500
@@ -18,6 +18,13 @@
#ifndef HEADER_TLS_H
#define HEADER_TLS_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stddef.h>
+#include <stdint.h>
+
#define TLS_API 20141031
#define TLS_PROTOCOL_TLSv1_0 (1 << 1)
@@ -88,4 +95,8 @@
uint8_t *tls_load_file(const char *_file, size_t *_len, char *_password);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* HEADER_TLS_H */

View File

@ -63,9 +63,8 @@ $CP $libssl_src/src/crypto/opensslfeatures.h include/openssl
$CP $libssl_src/src/e_os2.h include/openssl
$CP $libssl_src/src/ssl/pqueue.h include
$CP $libtls_src/tls.h include/tls.h
patch -p0 < patches/tls.h.patch
$CP include/tls.h libtls-standalone/include
$CP $libtls_src/tls.h include
$CP $libtls_src/tls.h libtls-standalone/include
for i in crypto/compat libtls-standalone/compat; do
$CP $libc_src/crypt/arc4random.c \