]> Savannah Git Hosting - gnulib.git/commitdiff
Fix compilation error on native Windows (regression from 2020-05-28).
authorBruno Haible <bruno@clisp.org>
Fri, 29 May 2020 10:33:46 +0000 (12:33 +0200)
committerBruno Haible <bruno@clisp.org>
Fri, 29 May 2020 10:33:46 +0000 (12:33 +0200)
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
lib/gettimeofday.c
lib/isatty.c
lib/stat-w32.c

index 77c6374147a818206ddc5bc8de1a35e2b4dc4340..1c6641c2cda3671eb2bbd541e862ccd67a96e8a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
index 3d53115d9f0bcedc3a533497c32d952cde8e2b1d..93914ba92034fb0a8b1ff970a980c4c6a57b9bbe 100644 (file)
@@ -56,6 +56,10 @@ initialize (void)
   initialized = TRUE;
 }
 
+# else
+
+#  define GetSystemTimePreciseAsFileTimeFunc GetSystemTimePreciseAsFileTime
+
 # endif
 
 #endif
index fc771d1036659b5aed3cf6733867384536ecb508..4c5b8e378f5e4d214d3c3cb04ca4e89fbd3cf5fa 100644 (file)
@@ -71,6 +71,11 @@ initialize (void)
   initialized = TRUE;
 }
 
+#else
+
+# define GetNamedPipeClientProcessIdFunc GetNamedPipeClientProcessId
+# define QueryFullProcessImageNameFunc QueryFullProcessImageName
+
 #endif
 
 static BOOL IsConsoleHandle (HANDLE h)
index 02ad9abe63f0672485366c175a9cc0cadb1d7b21..cca12dd9cd734cd99adc5d43384c56b6662aab8e 100644 (file)
@@ -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.  */