diff options
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rwxr-xr-x | bin/restore.sh | 67 | ||||
| -rw-r--r-- | src/H5FDlog.c | 17 |
3 files changed, 77 insertions, 8 deletions
@@ -84,6 +84,7 @@ ./bin/output_filter.sh ./bin/README _DO_NOT_DISTRIBUTE_ ./bin/release +./bin/restore.sh ./bin/runtest _DO_NOT_DISTRIBUTE_ ./bin/snapshot ./bin/snapshot_version _DO_NOT_DISTRIBUTE_ diff --git a/bin/restore.sh b/bin/restore.sh new file mode 100755 index 0000000..7f1c7bb --- /dev/null +++ b/bin/restore.sh @@ -0,0 +1,67 @@ +#!/bin/sh +# +# Copyright by The HDF Group. +# All rights reserved. +# +# This file is part of HDF5. The full HDF5 copyright notice, including +# terms governing use, modification, and redistribution, is contained in +# the files COPYING and Copyright.html. COPYING can be found at the root +# of the source code distribution tree; Copyright.html can be found at the +# root level of an installed copy of the electronic document set and is +# linked from the top-level documents page. It can also be found at +# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have access +# to either file, you may request a copy from help@hdfgroup.org. +# + +# A script to clean up the action of autogen.sh +# +# If this script fails to clean up generated files on a particular +# platform, please contact help@hdfgroup.org or comment on the forum. + +echo +echo "*******************************" +echo "* HDF5 autogen.sh undo script *" +echo "*******************************" +echo + +echo "Remove autom4te.cache directory" +rm -rf autom4te.cache + +echo "Remove configure script" +rm -f configure + +echo "Remove Makefile.in files" +find . -type f -name 'Makefile.in' -exec rm {} \; + +echo "Remove files generated by libtoolize" +rm -f bin/ltmain.sh +rm -f m4/libtool.m4 +rm -f m4/ltoptions.m4 +rm -f m4/ltsugar.m4 +rm -f m4/ltversion.m4 +rm -f m4/lt~obsolete.m4 + +echo "Remove files generated by automake" +rm -f bin/compile +rm -f bin/config.guess +rm -f bin/config.sub +rm -f bin/install-sh +rm -f bin/missing +rm -f bin/test-driver +rm -f bin/depcomp + +echo "Remove files generated by bin/make_err" +rm -f src/H5Epubgen.h +rm -f src/H5Einit.h +rm -f src/H5Eterm.h +rm -f src/H5Edefin.h + +echo "Remove files generated by bin/make_vers" +rm -f src/H5version.h + +echo "Remove files generated by bin/make_overflow" +rm -f src/H5overflow.h + +echo "Remove remaining generated files" +rm -f aclocal.m4 + diff --git a/src/H5FDlog.c b/src/H5FDlog.c index dae0e4a..9f5dfa5 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -1567,7 +1567,15 @@ static herr_t H5FD_log_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_UNUSED closing) { H5FD_log_t *file = (H5FD_log_t *)_file; - herr_t ret_value = SUCCEED; /* Return value */ +#ifdef H5_HAVE_WIN32_API + LARGE_INTEGER li; /* 64-bit (union) integer for SetFilePointer() call */ + DWORD dwPtrLow; /* Low-order pointer bits from SetFilePointer() + * Only used as an error code here. + */ + DWORD dwError; /* DWORD error code from GetLastError() */ + BOOL bError; /* Boolean error flag */ +#endif /* H5_HAVE_WIN32_API */ +herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1584,13 +1592,6 @@ H5FD_log_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_U HDgettimeofday(&timeval_start, NULL); #endif /* H5_HAVE_GETTIMEOFDAY */ #ifdef H5_HAVE_WIN32_API - LARGE_INTEGER li; /* 64-bit (union) integer for SetFilePointer() call */ - DWORD dwPtrLow; /* Low-order pointer bits from SetFilePointer() - * Only used as an error code here. - */ - DWORD dwError; /* DWORD error code from GetLastError() */ - BOOL bError; /* Boolean error flag */ - /* Windows uses this odd QuadPart union for 32/64-bit portability */ li.QuadPart = (__int64)file->eoa; |