WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

switch pragma once uses, causes warnings on some compilers

pull/224/head
Chris Conlon 2015-12-17 13:19:17 -07:00
parent ed8a50ce69
commit b89354880f
12 changed files with 86 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IDE/ROWLEY-CROSSWORKS-ARM/hw.h
View File

@ -1,4 +1,7 @@
#pragma once
#ifndef WOLFSSL_ROWLEY_HW_H
#define WOLFSSL_ROWLEY_HW_H
#include <__cross_studio_io.h> #include <__cross_studio_io.h>
#include <__libc.h> #include <__libc.h>
@ -11,3 +14,7 @@ uint32_t hw_get_time_msec(void);
void hw_uart_printchar(int c); void hw_uart_printchar(int c);
void hw_watchdog_disable(void); void hw_watchdog_disable(void);
uint32_t hw_rand(void); uint32_t hw_rand(void);
#endif /* WOLFSSL_ROWLEY_HW_H */

11
configure.ac
View File

@ -2581,7 +2581,9 @@ echo " *" >> $OPTION_FILE
echo " */" >> $OPTION_FILE echo " */" >> $OPTION_FILE
echo "" >> $OPTION_FILE echo "" >> $OPTION_FILE
echo "#pragma once" >> $OPTION_FILE echo "#ifndef WOLFSSL_OPTIONS_H" >> $OPTION_FILE
echo "#define WOLFSSL_OPTIONS_H" >> $OPTION_FILE
echo "" >> $OPTION_FILE
echo "" >> $OPTION_FILE echo "" >> $OPTION_FILE
echo "#ifdef __cplusplus" >> $OPTION_FILE echo "#ifdef __cplusplus" >> $OPTION_FILE
echo "extern \"C\" {" >> $OPTION_FILE echo "extern \"C\" {" >> $OPTION_FILE
@ -2627,6 +2629,9 @@ echo "#ifdef __cplusplus" >> $OPTION_FILE
echo "}" >> $OPTION_FILE echo "}" >> $OPTION_FILE
echo "#endif" >> $OPTION_FILE echo "#endif" >> $OPTION_FILE
echo "" >> $OPTION_FILE echo "" >> $OPTION_FILE
echo "" >> $OPTION_FILE
echo "#endif /* WOLFSSL_OPTIONS_H */" >> $OPTION_FILE
echo "" >> $OPTION_FILE
echo echo
#backwards compatability for those who have included options or version #backwards compatability for those who have included options or version
@ -2640,6 +2645,10 @@ do
echo "$line" >> cyassl/options.h echo "$line" >> cyassl/options.h
done < $OPTION_FILE done < $OPTION_FILE
# switch ifdef protection in cyassl/option.h to CYASSL_OPTONS_H, remove bak
sed -i.bak 's/WOLFSSL_OPTIONS_H/CYASSL_OPTIONS_H/g' cyassl/options.h
rm cyassl/options.h.bak
# output config summary # output config summary
echo "---" echo "---"
echo "Configuration summary for $PACKAGE_NAME version $VERSION" echo "Configuration summary for $PACKAGE_NAME version $VERSION"

7
cyassl/options.h.in
View File

@ -21,7 +21,9 @@
/* default blank options for autoconf */ /* default blank options for autoconf */
#pragma once #ifndef CYASSL_OPTIONS_H
#define CYASSL_OPTIONS_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -32,3 +34,6 @@ extern "C" {
} }
#endif #endif
#endif /* CYASSL_OPTIONS_H */

8
examples/client/client.h
View File

@ -19,7 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#pragma once #ifndef WOLFSSL_CLIENT_H
#define WOLFSSL_CLIENT_H
THREAD_RETURN WOLFSSL_THREAD client_test(void* args); THREAD_RETURN WOLFSSL_THREAD client_test(void* args);
@ -31,3 +33,7 @@ int ClientBenchmarkConnections(WOLFSSL_CTX* ctx, char* host, word16 port,
/* Measures throughput in kbps. Throughput = number of bytes */ /* Measures throughput in kbps. Throughput = number of bytes */
int ClientBenchmarkThroughput(WOLFSSL_CTX* ctx, char* host, word16 port, int ClientBenchmarkThroughput(WOLFSSL_CTX* ctx, char* host, word16 port,
int doDTLS, int throughput); int doDTLS, int throughput);
#endif /* WOLFSSL_CLIENT_H */

9
examples/echoclient/echoclient.h
View File

@ -19,5 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#pragma once #ifndef WOLFSSL_ECHOCLIENT_H
#define WOLFSSL_ECHOCLIENT_H
void echoclient_test(void* args); void echoclient_test(void* args);
#endif /* WOLFSSL_ECHOCLIENT_H */

8
examples/echoserver/echoserver.h
View File

@ -19,6 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#pragma once #ifndef WOLFSSL_ECHOSERVER_H
#define WOLFSSL_ECHOSERVER_H
THREAD_RETURN WOLFSSL_THREAD echoserver_test(void* args); THREAD_RETURN WOLFSSL_THREAD echoserver_test(void* args);
#endif /* WOLFSSL_ECHOSERVER_H */

8
examples/server/server.h
View File

@ -19,10 +19,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#pragma once #ifndef WOLFSSL_SERVER_H
#define WOLFSSL_SERVER_H
THREAD_RETURN WOLFSSL_THREAD server_test(void* args); THREAD_RETURN WOLFSSL_THREAD server_test(void* args);
/* Echo bytes using buffer of TEST_BUFFER_SIZE until [echoData] bytes are complete. */ /* Echo bytes using buffer of TEST_BUFFER_SIZE until [echoData] bytes are complete. */
/* If [bechmarkThroughput] set the statistcs will be output at the end */ /* If [bechmarkThroughput] set the statistcs will be output at the end */
int ServerEchoData(WOLFSSL* ssl, int clientfd, int echoData, int benchmarkThroughput); int ServerEchoData(WOLFSSL* ssl, int clientfd, int echoData, int benchmarkThroughput);
#endif /* WOLFSSL_SERVER_H */

8
wolfcrypt/benchmark/benchmark.h
View File

@ -19,7 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#pragma once #ifndef WOLFCRYPT_BENCHMARK_H
#define WOLFCRYPT_BENCHMARK_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -30,3 +32,7 @@ int benchmark_test(void* args);
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif
#endif /* WOLFCRYPT_BENCHMARK_H */

7
wolfcrypt/test/test.h
View File

@ -19,7 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#pragma once #ifndef WOLFCRYPT_TEST_H
#define WOLFCRYPT_TEST_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -31,3 +33,6 @@ int wolfcrypt_test(void* args);
} /* extern "C" */ } /* extern "C" */
#endif #endif
#endif /* WOLFCRYPT_TEST_H */

7
wolfssl/options.h.in
View File

@ -21,7 +21,9 @@
/* default blank options for autoconf */ /* default blank options for autoconf */
#pragma once #ifndef WOLFSSL_OPTIONS_H
#define WOLFSSL_OPTIONS_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -32,3 +34,6 @@ extern "C" {
} }
#endif #endif
#endif /* WOLFSSL_OPTIONS_H */

6
wolfssl/version.h
View File

@ -19,8 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef WOLFSSL_VERSION_H
#define WOLFSSL_VERSION_H
#pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -33,3 +34,6 @@ extern "C" {
} }
#endif #endif
#endif /* WOLFSSL_VERSION_H */

6
wolfssl/version.h.in
View File

@ -19,8 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef WOLFSSL_VERSION_H
#define WOLFSSL_VERSION_H
#pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -33,3 +34,6 @@ extern "C" {
} }
#endif #endif
#endif /* WOLFSSL_VERSION_H */