diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-06-27 15:44:50 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-06-27 15:44:50 (GMT) |
| commit | 0fe43fbf2cd56f142ec322daca2a669fac8243ed (patch) | |
| tree | f01427e9de3133b822475e1aeb3c73ad21a4ec1f /src/H5Pint.c | |
| parent | 7320a66aa7224549c308132a796cef325d377116 (diff) | |
| parent | a4dc3ff34d2dec4db339851df381b67970853f2a (diff) | |
| download | hdf5-0fe43fbf2cd56f142ec322daca2a669fac8243ed.zip hdf5-0fe43fbf2cd56f142ec322daca2a669fac8243ed.tar.gz hdf5-0fe43fbf2cd56f142ec322daca2a669fac8243ed.tar.bz2 | |
[svn-r23834] merge from trunk up to r23833.
Fixed several conflicts, mostly because calling API routines internally was removed from several places in the trunk.
Diffstat (limited to 'src/H5Pint.c')
| -rw-r--r-- | src/H5Pint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Pint.c b/src/H5Pint.c index 52db9d5..a117469 100644 --- a/src/H5Pint.c +++ b/src/H5Pint.c @@ -2684,7 +2684,7 @@ done: PURPOSE Internal routine to query the existance of a property in a property list. USAGE - herr_t H5P_exist_plist(plist, name) + htri_t H5P_exist_plist(plist, name) const H5P_genplist_t *plist; IN: Property list to check const char *name; IN: Name of property to check for RETURNS |