summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2015-08-28 20:03:07 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2015-08-28 20:03:07 (GMT)
commit1d3a7ec6515f26f13cb5d8e5c65fd848fd235d8f (patch)
tree3d71176ae7b34e5b44edd13ca5fab3327e8a4b29 /src
parent05bf2c042c1ac3da45b03dc7a7954890378fcac1 (diff)
parent1847391fc51728811407f3e1586213758c1d0e89 (diff)
downloadhdf5-1d3a7ec6515f26f13cb5d8e5c65fd848fd235d8f.zip
hdf5-1d3a7ec6515f26f13cb5d8e5c65fd848fd235d8f.tar.gz
hdf5-1d3a7ec6515f26f13cb5d8e5c65fd848fd235d8f.tar.bz2
[svn-r27606] Merge revisions 27593 through 27605 from trunk to vds branch.
Tested: ummon
Diffstat (limited to 'src')
-rw-r--r--src/H5.c1
-rw-r--r--src/H5S.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/H5.c b/src/H5.c
index 8563545..2e05819 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -31,7 +31,6 @@
#include "H5Pprivate.h" /* Property lists */
#include "H5SLprivate.h" /* Skip lists */
#include "H5Tprivate.h" /* Datatypes */
-#include "H5TSprivate.h" /* Thread safety */
/****************/
/* Local Macros */
diff --git a/src/H5S.c b/src/H5S.c
index bc95472..f3dc48c 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -186,7 +186,7 @@ H5S_create(H5S_class_t type)
FUNC_ENTER_NOAPI(NULL)
/* Create a new dataspace */
- if(NULL == (new_ds = H5FL_MALLOC(H5S_t)))
+ if(NULL == (new_ds = H5FL_CALLOC(H5S_t)))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
/* Initialize default dataspace state */