diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-12-11 23:10:08 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-12-11 23:10:08 (GMT) |
| commit | abf6bb125007b9df5cbd1c10f63541a1f0e65bb1 (patch) | |
| tree | b5bc1e908176a63328cc727790c1246801829778 /src | |
| parent | bd7b943c452a54a37a7bde0d56caf4d4bc2768f8 (diff) | |
| parent | f30381d33d9e179ec30a8b46c2db218f2c45d2c1 (diff) | |
| download | hdf5-abf6bb125007b9df5cbd1c10f63541a1f0e65bb1.zip hdf5-abf6bb125007b9df5cbd1c10f63541a1f0e65bb1.tar.gz hdf5-abf6bb125007b9df5cbd1c10f63541a1f0e65bb1.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_12)
* commit 'f30381d33d9e179ec30a8b46c2db218f2c45d2c1':
Fix issues when using ONLY_SHARED_LIBS
Change defines to not conflict with windows
Correct assignment
Fix h5watch fault
Add missing include folder
Fix reference file
Correct testfile name
Remove program find - future rework
Fix compile error and add ref destroy to Java test
HDFFV-10876 Merge from develop
Remove unneeded flag overwrites
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5private.h | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/src/H5private.h b/src/H5private.h index 0bfc91b..5e07183 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1189,13 +1189,23 @@ typedef off_t h5_stat_size_t; #define HDrandom() HDrand() #endif /* HDrandom */ H5_DLL int HDrand(void); -#elif H5_HAVE_RANDOM + #ifndef HDsrandom + #define HDsrandom(S) HDsrand(S) + #endif /* HDsrandom */ + H5_DLL void HDsrand(unsigned int seed); +#elif defined(H5_HAVE_RANDOM) #ifndef HDrand #define HDrand() random() #endif /* HDrand */ #ifndef HDrandom #define HDrandom() random() #endif /* HDrandom */ + #ifndef HDsrand + #define HDsrand(S) srandom(S) + #endif /* HDsrand */ + #ifndef HDsrandom + #define HDsrandom(S) srandom(S) + #endif /* HDsrandom */ #else /* H5_HAVE_RANDOM */ #ifndef HDrand #define HDrand() rand() @@ -1203,6 +1213,12 @@ typedef off_t h5_stat_size_t; #ifndef HDrandom #define HDrandom() rand() #endif /* HDrandom */ + #ifndef HDsrand + #define HDsrand(S) srand(S) + #endif /* HDsrand */ + #ifndef HDsrandom + #define HDsrandom(S) srand(S) + #endif /* HDsrandom */ #endif /* H5_HAVE_RANDOM */ #ifndef HDread @@ -1323,26 +1339,6 @@ typedef off_t h5_stat_size_t; #ifndef HDsqrt #define HDsqrt(X) sqrt(X) #endif /* HDsqrt */ -#ifdef H5_HAVE_RAND_R - H5_DLL void HDsrand(unsigned int seed); - #ifndef HDsrandom - #define HDsrandom(S) HDsrand(S) - #endif /* HDsrandom */ -#elif H5_HAVE_RANDOM - #ifndef HDsrand - #define HDsrand(S) srandom(S) - #endif /* HDsrand */ - #ifndef HDsrandom - #define HDsrandom(S) srandom(S) - #endif /* HDsrandom */ -#else /* H5_HAVE_RAND_R */ - #ifndef HDsrand - #define HDsrand(S) srand(S) - #endif /* HDsrand */ - #ifndef HDsrandom - #define HDsrandom(S) srand(S) - #endif /* HDsrandom */ -#endif /* H5_HAVE_RAND_R */ #ifndef HDsscanf #define HDsscanf(S,FMT,...) sscanf(S,FMT,__VA_ARGS__) #endif /* HDsscanf */ |