diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2015-04-02 13:41:02 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2015-04-02 13:42:12 +0200 |
| commit | dc30183d8aa9f06c2dc9375a882d16e87dbd4272 (patch) | |
| tree | 84cbdd0fe7492c0a53a25d3129d263578747629e | |
| parent | 396f5e21103490fc2eae5509cf9afc723ae85842 (diff) | |
cmake: Detect __func__ and __FUNCTION__ during configure step
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
| -rw-r--r-- | ConfigureChecks.cmake | 14 | ||||
| -rw-r--r-- | config.h.cmake | 3 | ||||
| -rw-r--r-- | include/libssh/pki_priv.h | 2 | ||||
| -rw-r--r-- | include/libssh/priv.h | 8 |
4 files changed, 24 insertions, 3 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index e1eed715..652a6515 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -201,6 +201,20 @@ int main(void) return 0; }" HAVE_GCC_VOLATILE_MEMORY_PROTECTION) +check_c_source_compiles(" +#include <stdio.h> +int main(void) { + printf(\"%s\", __func__); + return 0; +}" HAVE_COMPILER__FUNC__) + +check_c_source_compiles(" +#include <stdio.h> +int main(void) { + printf(\"%s\", __FUNCTION__); + return 0; +}" HAVE_COMPILER__FUNCTION__) + if (WITH_DEBUG_CRYPTO) set(DEBUG_CRYPTO 1) endif (WITH_DEBUG_CRYPTO) diff --git a/config.h.cmake b/config.h.cmake index 396656d2..9eb1d3a1 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -139,6 +139,9 @@ #cmakedefine HAVE_GCC_VOLATILE_MEMORY_PROTECTION 1 +#cmakedefine HAVE_COMPILER__FUNC__ 1 +#cmakedefine HAVE_COMPILER__FUNCTION__ 1 + /* Define to 1 if you want to enable GSSAPI */ #cmakedefine WITH_GSSAPI 1 diff --git a/include/libssh/pki_priv.h b/include/libssh/pki_priv.h index 0cbe8b72..788ae616 100644 --- a/include/libssh/pki_priv.h +++ b/include/libssh/pki_priv.h @@ -29,7 +29,7 @@ #define ECDSA_HEADER_END "-----END EC PRIVATE KEY-----" #define ssh_pki_log(...) \ - _ssh_pki_log(__FUNCTION__, __VA_ARGS__) + _ssh_log(SSH_LOG_FUNCTIONS, __func__, __VA_ARGS__) void _ssh_pki_log(const char *function, const char *format, ...) PRINTF_ATTRIBUTE(2, 3); diff --git a/include/libssh/priv.h b/include/libssh/priv.h index 1184ab4a..4cbab95e 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -139,8 +139,12 @@ int gettimeofday(struct timeval *__p, void *__t); #define MAX_BUF_SIZE 4096 #endif -#ifndef __func__ -#define __func__ __FUNCTION__ +#ifndef HAVE_COMPILER__FUNC__ +# ifdef HAVE_COMPILER__FUNCTION__ +# define __func__ __FUNCTION__ +# else +# error "Your system must provide a __func__ macro" +# endif #endif #if defined(HAVE_GCC_THREAD_LOCAL_STORAGE) |