diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-03-21 16:36:23 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-03-21 16:36:23 (GMT) |
| commit | 7f641b520d13fa0dfd14baa067d165af0bd8d463 (patch) | |
| tree | c9e83bdf72df201cd0aeec2f4458cee4a6386784 | |
| parent | 9c570c7b4227fce7fdfbb2dba20fb8e9290b5e26 (diff) | |
| download | hdf5-7f641b520d13fa0dfd14baa067d165af0bd8d463.zip hdf5-7f641b520d13fa0dfd14baa067d165af0bd8d463.tar.gz hdf5-7f641b520d13fa0dfd14baa067d165af0bd8d463.tar.bz2 | |
[svn-r29482] Switched a few Visual Studio #ifdefs to Win32
Tested on 64-bit Win10 w/ VS 2015 Pro
| -rw-r--r-- | src/H5system.c | 4 | ||||
| -rw-r--r-- | src/H5win32defs.h | 4 | ||||
| -rw-r--r-- | tools/perform/sio_standalone.h | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/H5system.c b/src/H5system.c index eb09b15..e6ca5d4 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -728,7 +728,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5_make_time() */ -#ifdef H5_HAVE_VISUAL_STUDIO +#ifdef H5_HAVE_WIN32_API /* Offset between 1/1/1601 and 1/1/1970 in 100 nanosecond units */ #define _W32_FT_OFFSET (116444736000000000ULL) @@ -912,7 +912,7 @@ Wflock(int fd, int operation) { return 0; } /* end Wflock() */ -#endif /* H5_HAVE_VISUAL_STUDIO */ +#endif /* H5_HAVE_WIN32_API */ /*------------------------------------------------------------------------- diff --git a/src/H5win32defs.h b/src/H5win32defs.h index 2a0f22d..a757832 100644 --- a/src/H5win32defs.h +++ b/src/H5win32defs.h @@ -65,6 +65,8 @@ typedef __int64 h5_stat_size_t; */ #define HDmemset(X,C,Z) memset((void*)(X),C,Z) +#endif /* H5_HAVE_VISUAL_STUDIO */ + struct timezone { int tz_minuteswest; int tz_dsttime; @@ -90,8 +92,6 @@ extern "C" { #define HDsnprintf c99_snprintf /*varargs*/ #define HDvsnprintf c99_vsnprintf /*varargs*/ -#endif /* H5_HAVE_VISUAL_STUDIO */ - /* Non-POSIX functions */ /* Don't use actual pthread_self on Windows because the return diff --git a/tools/perform/sio_standalone.h b/tools/perform/sio_standalone.h index 547a9ee..258eafb 100644 --- a/tools/perform/sio_standalone.h +++ b/tools/perform/sio_standalone.h @@ -210,11 +210,11 @@ H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...); #define HDgetgrgid(G) getgrgid(G) #define HDgetgrnam(S) getgrnam(S) #define HDgetgroups(Z,G) getgroups(Z,G) -#ifdef H5_HAVE_VISUAL_STUDIO +#ifdef H5_HAVE_WIN32_API #define HDgetlogin() Wgetlogin() -#else /* H5_HAVE_VISUAL_STUDIO */ +#else /* H5_HAVE_WIN32_API */ #define HDgetlogin() getlogin() -#endif /* H5_HAVE_VISUAL_STUDIO */ +#endif /* H5_HAVE_WIN32_API */ #define HDgetpgrp() getpgrp() #define HDgetpid() getpid() #define HDgetppid() getppid() @@ -222,12 +222,12 @@ H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...); #define HDgetpwuid(U) getpwuid(U) #define HDgetrusage(X,S) getrusage(X,S) #define HDgets(S) gets(S) -#ifdef H5_HAVE_VISUAL_STUDIO +#ifdef H5_HAVE_WIN32_API H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz); #define HDgettimeofday(V,Z) Wgettimeofday(V,Z) -#else /* H5_HAVE_VISUAL_STUDIO */ +#else /* H5_HAVE_WIN32_API */ #define HDgettimeofday(S,P) gettimeofday(S,P) -#endif /* H5_HAVE_VISUAL_STUDIO */ +#endif /* H5_HAVE_WIN32_API */ #define HDgetuid() getuid() #define HDgmtime(T) gmtime(T) #define HDisalnum(C) isalnum((int)(C)) /*cast for solaris warning*/ |