The branch OpenSSL_1_1_0-stable has been updated
via 5fc89c1af837026b5812526ef6f519bf7ca42f16 (commit)
from 867dc5441aab7c813136e996d5d437740e6a3c18 (commit)
- Log -----------------------------------------------------------------
commit 5fc89c1af837026b5812526ef6f519bf7ca42f16
Author: Bernd Edlinger <bernd.edlin...@hotmail.de>
Date: Thu Apr 19 22:17:24 2018 +0200
Fix a warning about missing prototype on arm
Reviewed-by: Rich Salz <rs...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6028)
-----------------------------------------------------------------------
Summary of changes:
crypto/armcap.c | 1 +
crypto/include/internal/cryptlib.h | 2 ++
2 files changed, 3 insertions(+)
diff --git a/crypto/armcap.c b/crypto/armcap.c
index 432a06c..1f4e31f 100644
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -13,6 +13,7 @@
#include <setjmp.h>
#include <signal.h>
#include <openssl/crypto.h>
+#include <internal/cryptlib.h>
#include "arm_arch.h"
diff --git a/crypto/include/internal/cryptlib.h
b/crypto/include/internal/cryptlib.h
index f3ec9b6..69b00eb 100644
--- a/crypto/include/internal/cryptlib.h
+++ b/crypto/include/internal/cryptlib.h
@@ -74,6 +74,8 @@ FILE *openssl_fopen(const char *filename, const char *mode);
void *openssl_fopen(const char *filename, const char *mode);
# endif
+unsigned long OPENSSL_rdtsc(void);
+
#ifdef __cplusplus
}
#endif
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
