diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2013-10-31 06:28:12 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2013-10-31 06:28:12 (GMT) |
| commit | 821090788e60f8324e2a45de1cf9c2d9ae406ee7 (patch) | |
| tree | 85e7e7f822cf717234c26f55470ac117569bc393 /src | |
| parent | d6b116be67151d94428c588db29489b64187398f (diff) | |
| download | hdf5-821090788e60f8324e2a45de1cf9c2d9ae406ee7.zip hdf5-821090788e60f8324e2a45de1cf9c2d9ae406ee7.tar.gz hdf5-821090788e60f8324e2a45de1cf9c2d9ae406ee7.tar.bz2 | |
[svn-r24379] Merged r24333 from trunk.
Added volatile keyword to find_bias() function in H5detect. Fixes HDFFV-8547.
Change to H5win32defs.h fixes a minor typo.
Tested on 64-bit Visual Studio 2010 / 64-bit Windows 7 (Visual Studio warning)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5detect.c | 4 | ||||
| -rw-r--r-- | src/H5win32defs.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/H5detect.c b/src/H5detect.c index be661ea..3554d50 100644 --- a/src/H5detect.c +++ b/src/H5detect.c @@ -124,7 +124,7 @@ static int bit_cmp(int, int *, volatile void *, volatile void *, static void fix_order(int, int, int *, const char **); static int imp_bit(int, int *, volatile void *, volatile void *, const unsigned char *); -static unsigned long find_bias(int, int, int *, void *); +static unsigned long find_bias(int, int, int *, volatile void *); static void precision (detected_t*); static void print_header(void); static void detect_C89_integers(void); @@ -1135,7 +1135,7 @@ imp_bit(int n, int *perm, volatile void *_a, volatile void *_b, *------------------------------------------------------------------------- */ static unsigned long -find_bias(int epos, int esize, int *perm, void *_a) +find_bias(int epos, int esize, int *perm, volatile void *_a) { unsigned char *a = (unsigned char *) _a; unsigned char mask; diff --git a/src/H5win32defs.h b/src/H5win32defs.h index d452925..185e9b4 100644 --- a/src/H5win32defs.h +++ b/src/H5win32defs.h @@ -74,7 +74,7 @@ struct timezone { extern "C" { #endif /* __cplusplus */ H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz); - H5_DLL char* Wgetlogin(); + H5_DLL char* Wgetlogin(void); H5_DLL int c99_snprintf(char* str, size_t size, const char* format, ...); H5_DLL int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap); #ifdef __cplusplus |