summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2002-01-16 19:39:56 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2002-01-16 19:39:56 (GMT)
commit8d9a7d3eb74b40a685c523600afa56ce5436884d (patch)
tree448243a5116dc94422b35787bdceea9fe0c97198 /src
parent3cd25f13c918fca96e7d88da3bb1f06e49fe2cac (diff)
downloadhdf5-8d9a7d3eb74b40a685c523600afa56ce5436884d.zip
hdf5-8d9a7d3eb74b40a685c523600afa56ce5436884d.tar.gz
hdf5-8d9a7d3eb74b40a685c523600afa56ce5436884d.tar.bz2
[svn-r4839] Purpose:
Bug fix Description: Missed CVS conflict in ifdef'd code Solution: Editted to remove CVS conflicted code. Platforms tested: FreeBSD 4.5 (sleipnir)
Diffstat (limited to 'src')
-rw-r--r--src/H5P.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/H5P.c b/src/H5P.c
index 8704f4d..aa88694 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -2451,18 +2451,11 @@ hsize_t
H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/)
{
H5P_genplist_t *plist; /* Property list pointer */
-<<<<<<< H5P.c
- herr_t ret_value=SUCCEED; /* return value */
-
- FUNC_ENTER (H5Pget_cache, FAIL);
- H5TRACE3("h","ixx",plist_id,tconv,bkg);
-=======
size_t size; /* Type conversion buffer size */
hsize_t ret_value=0; /* Type conversion buffer size */
FUNC_ENTER (H5Pget_buffer, 0);
H5TRACE3("h","ixx",plist_id,tconv,bkg);
->>>>>>> 1.183
/* Check arguments */
if (TRUE!=H5P_isa_class(plist_id,H5P_DATASET_XFER))