summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2013-10-19 23:43:06 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2013-10-19 23:43:06 (GMT)
commite9203a73e2c138991e80d91050e89a656f5a2974 (patch)
tree3a8394cbb6b2aa836f7287f814e0cff105c423d6
parent2aec2ec315ade157d649614e3522fd9fcdbd8e69 (diff)
downloadhdf5-e9203a73e2c138991e80d91050e89a656f5a2974.zip
hdf5-e9203a73e2c138991e80d91050e89a656f5a2974.tar.gz
hdf5-e9203a73e2c138991e80d91050e89a656f5a2974.tar.bz2
[svn-r24333] Added a few volatile keywords to H5detect.c to quiet Visual Studio warnings. Also added a void to a Windows-specific function.
These are both trivial changes that don't affect behavior. Tested on: Visual Studio 2010 on 64-bit Windows 7
-rw-r--r--src/H5detect.c4
-rw-r--r--src/H5win32defs.h2
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