diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-02-11 04:40:10 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-02-11 04:40:10 (GMT) |
| commit | 5655e5a91a538bd2cc885e5927f8ed61ab8e166b (patch) | |
| tree | f98ac54c24471ec1adc4b47a338b7b7ec67d030e /src/H5private.h | |
| parent | 63c90e5c67445de5deaaf45b70273fef1286ae60 (diff) | |
| download | hdf5-5655e5a91a538bd2cc885e5927f8ed61ab8e166b.zip hdf5-5655e5a91a538bd2cc885e5927f8ed61ab8e166b.tar.gz hdf5-5655e5a91a538bd2cc885e5927f8ed61ab8e166b.tar.bz2 | |
[svn-r29084] Revert of:
r29069 and 72 (gheap cleanup)
r29041 and 43 (HDFFV-8740 external storage)
These cause problems in the daily tests. They will be
re-introduced when their respective problems have been
addressed.
Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
autotools serial (check-vfd) w/ Fortran and C++
autotools parallel w/ Fortran
CMake serial
Diffstat (limited to 'src/H5private.h')
| -rw-r--r-- | src/H5private.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/H5private.h b/src/H5private.h index fa5a114..8d5f4c9 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1189,9 +1189,6 @@ typedef off_t h5_stat_size_t; #ifndef HDsetbuf #define HDsetbuf(F,S) setbuf(F,S) #endif /* HDsetbuf */ -#ifndef HDsetenv - #define HDsetenv(N,V,O) setenv(N,V,O) -#endif /* HDsetenv */ #ifndef HDsetgid #define HDsetgid(G) setgid(G) #endif /* HDsetgid */ @@ -2563,8 +2560,7 @@ H5_DLL uint32_t H5_hash_string(const char *str); H5_DLL time_t H5_make_time(struct tm *tm); /* Functions for building paths, etc. */ -H5_DLL herr_t H5_build_extpath(const char *name, char **extpath /*out*/); -H5_DLL herr_t H5_combine_path(const char *path1, const char *path2, char **full_name /*out*/); +H5_DLL herr_t H5_build_extpath(const char *, char ** /*out*/ ); /* Functions for debugging */ H5_DLL herr_t H5_buffer_dump(FILE *stream, int indent, const uint8_t *buf, |