Merge pull request #1922 from krzycz/vmmalloc-cfree_removal_1.2

vmmalloc: cfree removal (1.2)
pmem · May 19, 2017 · ac7de14 · ac7de14
2 parents ab781e1 + 1abc012
commit ac7de14
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,10 +1,11 @@
 
-Mon May 15 2017 Krzysztof Czurylo <krzysztof.czurylo@intel.com>
+Thu May 18 2017 Krzysztof Czurylo <krzysztof.czurylo@intel.com>
 
 	* Version 1.2.3
 	Bug fixes:
 	- test: extend timeout for selected tests
 	- test: reduce number of operations in obj_tx_mt
+	- test: define cfree() as free() in vmmalloc_calloc
 
 	Other changes:
 	- common: move Docker images to new repo

diff --git a/src/test/vmmalloc_calloc/TEST0 b/src/test/vmmalloc_calloc/TEST0
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright 2014-2016, Intel Corporation
+# Copyright 2014-2017, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -32,8 +32,7 @@
 #
 
 #
-# src/test/vmmalloc_calloc/TEST0 -- unit test for
-# libvmmalloc calloc/cfree
+# src/test/vmmalloc_calloc/TEST0 -- unit test for libvmmalloc calloc
 #
 export UNITTEST_NAME=vmmalloc_calloc/TEST0
 export UNITTEST_NUM=0

diff --git a/src/test/vmmalloc_calloc/vmmalloc_calloc.c b/src/test/vmmalloc_calloc/vmmalloc_calloc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016, Intel Corporation
+ * Copyright 2014-2017, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
  */
 
 /*
- * vmmalloc_calloc.c -- unit test for libvmmalloc calloc/cfree
+ * vmmalloc_calloc.c -- unit test for libvmmalloc calloc
  *
  * usage: vmmalloc_calloc
  */
@@ -43,6 +43,11 @@
 #define DEFAULT_COUNT	(SMALL_MAXCLASS / 4)
 #define DEFAULT_N	100
 
+/* cfree() has been removed from glibc since version 2.26 */
+#ifndef cfree
+#define cfree free
+#endif
+
 int
 main(int argc, char *argv[])
 {