diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2013-10-08 06:11:44 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2013-10-08 06:11:44 (GMT) |
| commit | 39fc26566e18ac81c43986ed2013676e2918ded2 (patch) | |
| tree | d6241c1c75a5769ad876258b182e84ff02d33e41 /hl/src | |
| parent | 43fc25841e2b4b0ad163fe967e6e0750ad3c6bba (diff) | |
| download | hdf5-39fc26566e18ac81c43986ed2013676e2918ded2.zip hdf5-39fc26566e18ac81c43986ed2013676e2918ded2.tar.gz hdf5-39fc26566e18ac81c43986ed2013676e2918ded2.tar.bz2 | |
[svn-r24263] Changes to do re-reads for metadata with checksums when a file is opened with SWMR access.
There are debugging printfs which will be removed when coding is finalized.
Also some bug fixes:
1) accum.c--clean up some warning messages and use new_argv/new_envp for the call to execve.
2) hl/tools/h5watch--clean up some warning messages and a bug fix for h5watch.c.
This checkin is awaiting code review feedback.
Diffstat (limited to 'hl/src')
| -rw-r--r-- | hl/src/H5HLprivate2.h | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/hl/src/H5HLprivate2.h b/hl/src/H5HLprivate2.h index 7480bd8..556c86f 100644 --- a/hl/src/H5HLprivate2.h +++ b/hl/src/H5HLprivate2.h @@ -60,12 +60,16 @@ #ifndef TRUE # define TRUE 1 #endif +#ifndef HDassert + #define HDassert(X) assert(X) +#endif /* HDassert */ #ifndef HDcalloc #define HDcalloc(N,Z) calloc(N,Z) #endif /* HDcalloc */ -#ifndef HDrealloc - #define HDrealloc(M,Z) realloc(M,Z) -#endif /* HDrealloc */ +#ifndef HDfflush + #define HDfflush(F) fflush(F) +#endif /* HDfflush */ +H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...); #ifndef HDfree #define HDfree(M) free(M) #endif /* HDfree */ @@ -75,33 +79,30 @@ #ifndef HDmemset #define HDmemset(X,C,Z) memset(X,C,Z) #endif /* HDmemset */ -#ifndef HDassert - #define HDassert(X) assert(X) -#endif /* HDassert */ -#ifndef HDstrlen - #define HDstrlen(S) strlen(S) -#endif /* HDstrlen */ +#ifndef HDrealloc + #define HDrealloc(M,Z) realloc(M,Z) +#endif /* HDrealloc */ +#ifndef HDsleep + #define HDsleep(N) sleep(N) +#endif /* HDsleep */ #ifndef HDstrcat #define HDstrcat(X,Y) strcat(X,Y) #endif /* HDstrcat */ +#ifndef HDstrcmp + #define HDstrcmp(X,Y) strcmp(X,Y) +#endif /* HDstrcmp */ +#ifndef HDstrlen + #define HDstrlen(S) strlen(S) +#endif /* HDstrlen */ #ifndef HDstrrchr #define HDstrrchr(S,C) strrchr(S,C) #endif /* HDstrrchr */ -#ifndef HDstrtol - #define HDstrtol(S,R,N) strtol(S,R,N) -#endif /* HDstrtol */ #ifndef HDstrtod #define HDstrtod(S,R) strtod(S,R) #endif /* HDstrtod */ -#ifndef HDsleep - #define HDsleep(N) sleep(N) -#endif /* HDsleep */ -#ifndef HDfflush - #define HDfflush(F) fflush(F) -#endif /* HDfflush */ -#ifndef HDstrcmp - #define HDstrcmp(X,Y) strcmp(X,Y) -#endif /* HDstrcmp */ +#ifndef HDstrtol + #define HDstrtol(S,R,N) strtol(S,R,N) +#endif /* HDstrtol */ /* * And now for a couple non-Posix functions... Watch out for systems that * define these in terms of macros. |