Add missing include guard to win32ntdll.h.

Oversight in commit e2f0f8ed.  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

diff --git a/src/include/port/win32ntdll.h b/src/include/port/win32ntdll.h
index ebfd2c1583e8e6bd6603d5c8c010f56800e20ec8..663b9754bd778f1e70ccb22e347798111dfef1d9 100644 (file)
--- 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
index e7cd65a5c7a53c1340bdc7f29d21126479c2cde3..42688fff53a43a44a368e0f9c663992ce82997ab 100755 (executable)
--- 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
index 397237358e7796c7e195e23574fdeb13688b1d6f..f8b0674a661803ee95ddfe7f6d04e620aa60e7e5 100755 (executable)
--- 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