MonetDB: default - Merge with Jun2016 branch.

[Sjoerd Mullender]

Changeset: c7f197b16264 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c7f197b16264
Modified Files:
        common/utils/mcrypt.c
Branch: default
Log Message:

Merge with Jun2016 branch.


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
@@ -44,7 +44,7 @@ mcrypt_getHashAlgorithms(void)
         * desire.
         */
 #if !defined(HAVE_EMBEDDED) && (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
@@ -66,7 +66,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
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list