diff options
| author | Bruno Haible <bruno@clisp.org> | 2020-05-29 12:33:46 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2020-05-29 12:33:46 +0200 |
| commit | ac22625862575119a0ff89dbfbef0979d3b420e6 (patch) | |
| tree | 303cd43d738fb15580c6b4fffdac59e654504188 | |
| parent | 9326739489050009e3b8834838abc02203c592e5 (diff) | |
| download | gnulib-ac22625862575119a0ff89dbfbef0979d3b420e6.tar.gz | |
Fix compilation error on native Windows (regression from 2020-05-28).
Reported by Daiki Ueno.
* lib/gettimeofday.c (GetSystemTimePreciseAsFileTimeFunc): Define as
macro when not using dynamic loading.
* lib/isatty.c (GetNamedPipeClientProcessIdFunc,
QueryFullProcessImageNameFunc): Likewise.
* lib/stat-w32.c (GetFileInformationByHandleExFunc,
GetFinalPathNameByHandleFunc): Likewise.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | lib/gettimeofday.c | 4 | ||||
| -rw-r--r-- | lib/isatty.c | 5 | ||||
| -rw-r--r-- | lib/stat-w32.c | 5 |
4 files changed, 25 insertions, 0 deletions
@@ -1,3 +1,14 @@ +2020-05-29 Bruno Haible <bruno@clisp.org> + + Fix compilation error on native Windows (regression from 2020-05-28). + Reported by Daiki Ueno. + * lib/gettimeofday.c (GetSystemTimePreciseAsFileTimeFunc): Define as + macro when not using dynamic loading. + * lib/isatty.c (GetNamedPipeClientProcessIdFunc, + QueryFullProcessImageNameFunc): Likewise. + * lib/stat-w32.c (GetFileInformationByHandleExFunc, + GetFinalPathNameByHandleFunc): Likewise. + 2020-05-29 Daiki Ueno <ueno@gnu.org> fopen-gnu-tests: fix "\x" escape usage diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c index 3d53115d9f..93914ba920 100644 --- a/lib/gettimeofday.c +++ b/lib/gettimeofday.c @@ -56,6 +56,10 @@ initialize (void) initialized = TRUE; } +# else + +# define GetSystemTimePreciseAsFileTimeFunc GetSystemTimePreciseAsFileTime + # endif #endif diff --git a/lib/isatty.c b/lib/isatty.c index fc771d1036..4c5b8e378f 100644 --- a/lib/isatty.c +++ b/lib/isatty.c @@ -71,6 +71,11 @@ initialize (void) initialized = TRUE; } +#else + +# define GetNamedPipeClientProcessIdFunc GetNamedPipeClientProcessId +# define QueryFullProcessImageNameFunc QueryFullProcessImageName + #endif static BOOL IsConsoleHandle (HANDLE h) diff --git a/lib/stat-w32.c b/lib/stat-w32.c index 02ad9abe63..cca12dd9cd 100644 --- a/lib/stat-w32.c +++ b/lib/stat-w32.c @@ -78,6 +78,11 @@ initialize (void) initialized = TRUE; } +#else + +# define GetFileInformationByHandleExFunc GetFileInformationByHandleEx +# define GetFinalPathNameByHandleFunc GetFinalPathNameByHandle + #endif /* Converts a FILETIME to GMT time since 1970-01-01 00:00:00. */ |