From ac22625862575119a0ff89dbfbef0979d3b420e6 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 29 May 2020 12:33:46 +0200 Subject: [PATCH] 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. --- ChangeLog | 11 +++++++++++ lib/gettimeofday.c | 4 ++++ lib/isatty.c | 5 +++++ lib/stat-w32.c | 5 +++++ 4 files changed, 25 insertions(+) diff --git a/ChangeLog b/ChangeLog index 77c6374147..1c6641c2cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2020-05-29 Bruno Haible + + 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 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. */ -- 2.39.5