Changeset: 3ee2af722ef2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3ee2af722ef2
Modified Files:
.hgtags
cmake/monetdb-defines.cmake
gdk/gdk_utils.h
monetdb_config.h.in
Branch: Jul2021
Log Message:
Merge with Oct2020 branch.
diffs (61 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -831,3 +831,4 @@ cab90a348501b045e19cee5cebcc44f3800bd0a8
2e54857a91306cc6304825c5596f65d00595db6b Jul2021_23
2e54857a91306cc6304825c5596f65d00595db6b Jul2021_SP6_release
1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3 Jun2020_13
+1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3 Jun2020_SP2_release
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -251,6 +251,7 @@ macro(monetdb_configure_crypto)
set(CRYPTO_LIBRARIES "${OPENSSL_CRYPTO_LIBRARY}" CACHE INTERNAL "crypto
libraries to link")
set(CMAKE_REQUIRED_INCLUDES
"${CMAKE_REQUIRED_INCLUDES};${CRYPTO_INCLUDE_DIR}")
set(CMAKE_REQUIRED_LIBRARIES
"${CMAKE_REQUIRED_LIBRARIES};${CRYPTO_LIBRARIES}")
+ set(CMAKE_REQUIRED_DEFINITIONS
"${CMAKE_REQUIRED_DEFINITIONS};-DOPENSSL_SUPPRESS_DEPRECATED=1")
check_symbol_exists("MD5_Update" "openssl/md5.h" HAVE_MD5_UPDATE)
check_symbol_exists("RIPEMD160_Update" "openssl/ripemd.h"
HAVE_RIPEMD160_UPDATE)
diff --git a/gdk/gdk_utils.h b/gdk/gdk_utils.h
--- a/gdk/gdk_utils.h
+++ b/gdk/gdk_utils.h
@@ -167,9 +167,11 @@ gdk_export int GDKms(void);
({ \
void *_ptr = (p); \
size_t _size = (s); \
+ char _buf[12]; \
+ snprintf(_buf, sizeof(_buf), "%p", _ptr); \
void *_res = GDKrealloc(_ptr, _size); \
- TRC_DEBUG(ALLOC, "GDKrealloc(%p,%zu) -> %p\n", \
- _ptr, _size, _res); \
+ TRC_DEBUG(ALLOC, "GDKrealloc(%s,%zu) -> %p\n", \
+ _buf, _size, _res); \
_res; \
})
#define GDKfree(p) \
@@ -238,9 +240,11 @@ gdk_export int GDKms(void);
({ \
void *_ptr = (p); \
size_t _size = (s); \
+ char _buf[12]; \
+ snprintf(_buf, sizeof(_buf), "%p", _ptr); \
void *_res = realloc(_ptr, _size); \
- TRC_DEBUG(ALLOC, "realloc(%p,%zu) -> %p\n", \
- _ptr, _size, _res); \
+ TRC_DEBUG(ALLOC, "realloc(%s,%zu) -> %p\n", \
+ _buf, _size, _res); \
_res; \
})
#define free(p) \
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -176,6 +176,7 @@
#cmakedefine HAVE_ICONV 1
#cmakedefine HAVE_PTHREAD_H 1
#cmakedefine HAVE_LIBPCRE 1
+#define OPENSSL_SUPPRESS_DEPRECATED
#cmakedefine HAVE_OPENSSL 1
#cmakedefine HAVE_COMMONCRYPTO 1
#cmakedefine HAVE_LIBBZ2 1
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
