diff options
author | Aris Adamantiadis <aris@0xbadc0de.be> | 2014-02-02 21:41:32 +0100 |
---|---|---|
committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2014-02-04 15:55:37 +0100 |
commit | 6f66032209cc5893ba942f5cf9201492ce8c4bb3 (patch) | |
tree | 0b13ad2c8657a0c4c94d4301100cbc896a5e2b2a | |
parent | c571cd84028c82737f42aef75c026b133893683f (diff) | |
download | libssh-6f66032209cc5893ba942f5cf9201492ce8c4bb3.tar.gz libssh-6f66032209cc5893ba942f5cf9201492ce8c4bb3.tar.xz libssh-6f66032209cc5893ba942f5cf9201492ce8c4bb3.zip |
build: remove OSX deprecated warnings for openssl
-rw-r--r-- | cmake/Modules/DefineCompilerFlags.cmake | 7 | ||||
-rw-r--r-- | include/libssh/priv.h | 10 |
2 files changed, 7 insertions, 10 deletions
diff --git a/cmake/Modules/DefineCompilerFlags.cmake b/cmake/Modules/DefineCompilerFlags.cmake index 0ab8802c..bfbc38fc 100644 --- a/cmake/Modules/DefineCompilerFlags.cmake +++ b/cmake/Modules/DefineCompilerFlags.cmake @@ -75,3 +75,10 @@ if (MSVC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_NONSTDC_NO_WARNINGS=1 /D _CRT_SECURE_NO_WARNINGS=1") endif (MSVC) + +# This removes this annoying warning +# "warning: 'BN_CTX_free' is deprecated: first deprecated in OS X 10.7 [-Wdeprecated-declarations]" +if (OSX) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations") +endif (OSX) + diff --git a/include/libssh/priv.h b/include/libssh/priv.h index 87f59e51..6da262ca 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -168,16 +168,6 @@ int gettimeofday(struct timeval *__p, void *__t); #include <sys/time.h> #endif -/* - * get rid of deprecacy warnings on OSX when using OpenSSL - */ -#if defined(__APPLE__) - #ifdef MAC_OS_X_VERSION_MIN_REQUIRED - #undef MAC_OS_X_VERSION_MIN_REQUIRED - #endif - #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_6 -#endif - /* forward declarations */ struct ssh_common_struct; struct ssh_kex_struct; |