diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-06 02:05:27 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-06 02:05:27 (GMT) |
commit | 67678e9a3f081a5d7e29b654a14b899f4ab50a9b (patch) | |
tree | 4b80130895965ed708bdcc5e1d3803ad05cf95a2 /src/H5private.h | |
parent | 2b35b265e91dea7157347aa0a631cc35bcabf6c9 (diff) | |
download | hdf5-67678e9a3f081a5d7e29b654a14b899f4ab50a9b.zip hdf5-67678e9a3f081a5d7e29b654a14b899f4ab50a9b.tar.gz hdf5-67678e9a3f081a5d7e29b654a14b899f4ab50a9b.tar.bz2 |
[svn-r27685] Merge of r27572 from trunk
Remove all VMS-specific code from the library. The exception is the VMS
floating-point tests since those are special as VMS floats are odd.
Those files will be considered separately.
Fixes HDFFV-9495
Tested on: h5committest
Diffstat (limited to 'src/H5private.h')
-rw-r--r-- | src/H5private.h | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/src/H5private.h b/src/H5private.h index 15bb61c..f554476 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1125,22 +1125,9 @@ H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...); #ifndef HDrealpath #define HDrealpath(F1,F2) realpath(F1,F2) #endif /* HDrealloc */ -#ifdef H5_VMS - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ - int HDremove_all(const char * fname); - #ifdef __cplusplus - } - #endif /* __cplusplus */ - #ifndef HDremove - #define HDremove(S) HDremove_all(S) - #endif /* HDremove */ -#else /* H5_VMS */ - #ifndef HDremove - #define HDremove(S) remove(S) - #endif /* HDremove */ -#endif /*H5_VMS*/ +#ifndef HDremove + #define HDremove(S) remove(S) +#endif /* HDremove */ #ifndef HDrename #define HDrename(OLD,NEW) rename(OLD,NEW) #endif /* HDrename */ @@ -1557,19 +1544,7 @@ extern char *strdup(const char *s); (ptr = slash); \ } -#elif defined(H5_HAVE_VMS_PATH) - -/* OpenVMS pathname: <disk name>$<partition>:[path]<file name> - * i.g. SYS$SYSUSERS:[LU.HDF5.SRC]H5system.c */ -#define H5_DIR_SEPC ']' -#define H5_DIR_SEPS "]" -#define H5_CHECK_DELIMITER(SS) (SS == H5_DIR_SEPC) -#define H5_CHECK_ABSOLUTE(NAME) (HDstrrchr(NAME, ':') && HDstrrchr(NAME, '[')) -#define H5_CHECK_ABS_DRIVE(NAME) (0) -#define H5_CHECK_ABS_PATH(NAME) (0) -#define H5_GET_LAST_DELIMITER(NAME, ptr) ptr = HDstrrchr(NAME, H5_DIR_SEPC); - -#else +#else /* H5_HAVE_WINDOW_PATH */ #define H5_DIR_SEPC '/' #define H5_DIR_SEPS "/" @@ -1579,7 +1554,7 @@ extern char *strdup(const char *s); #define H5_CHECK_ABS_PATH(NAME) (0) #define H5_GET_LAST_DELIMITER(NAME, ptr) ptr = HDstrrchr(NAME, H5_DIR_SEPC); -#endif +#endif /* H5_HAVE_WINDOW_PATH */ #define H5_COLON_SEPC ':' |