Changeset: 65477c82c5b3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65477c82c5b3
Modified Files:
common/utils/mcrypt.c
Branch: Jun2016
Log Message:
Work around what can only be described as a bug in Visual Studio.
It probably has to do with strdup being a macro.
diffs (22 lines):
diff --git a/common/utils/mcrypt.c b/common/utils/mcrypt.c
--- a/common/utils/mcrypt.c
+++ b/common/utils/mcrypt.c
@@ -41,7 +41,7 @@ mcrypt_getHashAlgorithms(void)
* desire.
*/
#if defined(HAVE_RIPEMD160_UPDATE) || defined(HAVE_SHA256_UPDATE) ||
defined(HAVE_SHA1_UPDATE) || defined(HAVE_MD5_UPDATE)
- return strdup(
+ const char *algorithms =
#ifdef HAVE_RIPEMD160_UPDATE
"RIPEMD160"
#endif
@@ -63,7 +63,8 @@ mcrypt_getHashAlgorithms(void)
#endif
"MD5"
#endif
- );
+ ;
+ return strdup(algorithms);
#else
fprintf(stderr, "There are no digest functions available.\n");
exit(1);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
