mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-24 15:25:00 +08:00
[svn-r29482] Switched a few Visual Studio #ifdefs to Win32
Tested on 64-bit Win10 w/ VS 2015 Pro
This commit is contained in:
parent
9c570c7b42
commit
7f641b520d
@ -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 */
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
|
@ -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
|
||||
|
@ -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*/
|
||||
|
Loading…
Reference in New Issue
Block a user