diff options
| author | Thomas Munro <tmunro@postgresql.org> | 2022-01-12 10:11:50 +1300 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2024-11-08 09:35:45 +1030 |
| commit | ce14dbbcafde5a629d4dbcabdadecea440e7955d (patch) | |
| tree | c92e1fdf72374e80aa587edafd5c0caf27f70d0a | |
| parent | 1bf47d89776c2647d896f308687fa13d6c2877e2 (diff) | |
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
(cherry picked from commit af9e6331aeba149c93052c3549140082a85a3cf9)
Author: Thomas Munro <tmunro@postgresql.org>
Author: Alexandra Wang <alexandra.wang.oss@gmail.com>
| -rw-r--r-- | src/include/port/win32ntdll.h | 5 | ||||
| -rwxr-xr-x | src/tools/pginclude/cpluspluscheck | 1 | ||||
| -rwxr-xr-x | src/tools/pginclude/headerscheck | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/include/port/win32ntdll.h b/src/include/port/win32ntdll.h index 4d8808b3aaf..b29b06b91f9 100644 --- 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 e52d5e42408..f75909d6dc6 100755 --- 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 9542cf37bc9..c0a57ad7a7f 100755 --- 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 |