Add missing include guard to win32ntdll.h.

macdice · adunstan · commit 5c0b7581ba12 · 2024-11-08T09:45:22.000+10:30
Oversight in commit e2f0f8e. Also add this file to the exclusion lists in headerscheck and cpluscpluscheck, because Unix systems don't have a header it includes. Reported-by: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://postgr.es/m/2760528.1641929756%40sss.pgh.pa.us (cherry picked from commit af9e633) Author: Thomas Munro <tmunro@postgresql.org> Author: Alexandra Wang <alexandra.wang.oss@gmail.com>
diff --git a/src/include/port/win32ntdll.h b/src/include/port/win32ntdll.h
@@ -11,6 +11,9 @@
  *-------------------------------------------------------------------------
  */
 
+#ifndef WIN32NTDLL_H
+#define WIN32NTDLL_H
+
 /*
  * Because this includes NT headers that normally conflict with Win32 headers,
  * any translation unit that includes it should #define UMDF_USING_NTSTATUS
@@ -25,3 +28,5 @@ typedef NTSTATUS (__stdcall *RtlGetLastNtStatus_t) (void);
 extern RtlGetLastNtStatus_t pg_RtlGetLastNtStatus;
 
 extern int	initialize_ntdll(void);
+
+#endif							/* WIN32NTDLL_H */
diff --git a/src/tools/pginclude/cpluspluscheck b/src/tools/pginclude/cpluspluscheck
@@ -75,6 +75,7 @@ do
 	test "$f" = src/include/port/win32/sys/socket.h && continue
 	test "$f" = src/include/port/win32_msvc/dirent.h && continue
 	test "$f" = src/include/port/win32_msvc/utime.h && continue
+	test "$f" = src/include/port/win32ntdll.h && continue
 	test "$f" = src/port/pthread-win32.h && continue
 
 	# Likewise, these files are platform-specific, and the one
diff --git a/src/tools/pginclude/headerscheck b/src/tools/pginclude/headerscheck
@@ -71,6 +71,7 @@ do
 	test "$f" = src/include/port/win32/sys/socket.h && continue
 	test "$f" = src/include/port/win32_msvc/dirent.h && continue
 	test "$f" = src/include/port/win32_msvc/utime.h && continue
+	test "$f" = src/include/port/win32ntdll.h && continue
 	test "$f" = src/port/pthread-win32.h && continue
 
 	# Likewise, these files are platform-specific, and the one
