database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Enable MSVC conforming preprocessor

Browse Source 
Switch MSVC to use the conforming preprocessor, using the
/Zc:preprocessor option.

This allows us to drop the alternative implementation of
VA_ARGS_NARGS() for the previous "traditional" preprocessor.

This also prepares the way for enabling C11 mode in the future, which
enables the conforming preprocessor by default.

This now requires Visual Studio 2019.  The installation documentation
is adjusted accordingly.

Discussion: https://www.postgresql.org/message-id/flat/01a69441-af54-4822-891b-ca28e05b215a%40eisentraut.org
This commit is contained in:
Peter Eisentraut
2025-07-01 09:36:33 +02:00
parent 732061150b
commit 8fd9bb1d96
3 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/src/sgml/installation.sgml
View File

@ -3847,17 +3847,13 @@ make: *** [postgres] Error 1
<para> <para>
Both 32-bit and 64-bit builds are possible with the Microsoft Compiler suite. Both 32-bit and 64-bit builds are possible with the Microsoft Compiler suite.
32-bit PostgreSQL builds are possible with 32-bit PostgreSQL builds are possible with
<productname>Visual Studio 2015</productname> to <productname>Visual Studio 2019</productname> to
<productname>Visual Studio 2022</productname>, <productname>Visual Studio 2022</productname>,
as well as standalone Windows SDK releases 10 and above. as well as standalone Windows SDK releases 10 and above.
64-bit PostgreSQL builds are supported with 64-bit PostgreSQL builds are supported with
<productname>Microsoft Windows SDK</productname> version 10 and above or <productname>Microsoft Windows SDK</productname> version 10 and above or
<productname>Visual Studio 2015</productname> and above. <productname>Visual Studio 2019</productname> and above.
<!-- <!--
For 2015 requirements:
https://docs.microsoft.com/en-us/visualstudio/productinfo/vs2015-sysrequirements-vs
For 2017 requirements:
https://docs.microsoft.com/en-us/visualstudio/productinfo/vs2017-system-requirements-vs
For 2019 requirements: For 2019 requirements:
https://docs.microsoft.com/en-us/visualstudio/releases/2019/system-requirements https://docs.microsoft.com/en-us/visualstudio/releases/2019/system-requirements
For 2022 requirements: For 2022 requirements:

4
meson.build
View File

@ -279,6 +279,10 @@ elif host_system == 'windows'
# define before including <time.h> for getting localtime_r() etc. on MinGW # define before including <time.h> for getting localtime_r() etc. on MinGW
cppflags += '-D_POSIX_C_SOURCE' cppflags += '-D_POSIX_C_SOURCE'
endif endif
if cc.get_id() == 'msvc'
# required for VA_ARGS_NARGS() in c.h; requires VS 2019
cppflags += '/Zc:preprocessor'
endif
export_file_format = 'win' export_file_format = 'win'
export_file_suffix = 'def' export_file_suffix = 'def'

19
src/include/c.h
View File

@ -376,25 +376,7 @@
* pretty trivial: VA_ARGS_NARGS_() returns its 64th argument, and we set up * pretty trivial: VA_ARGS_NARGS_() returns its 64th argument, and we set up
* the call so that that is the appropriate one of the list of constants. * the call so that that is the appropriate one of the list of constants.
* This idea is due to Laurent Deniau. * This idea is due to Laurent Deniau.
*
* MSVC has an implementation of __VA_ARGS__ that doesn't conform to the
* standard unless you use the /Zc:preprocessor compiler flag, but that
* isn't available before Visual Studio 2019. For now, use a different
* definition that also works on older compilers.
*/ */
#ifdef _MSC_VER
#define EXPAND(args) args
#define VA_ARGS_NARGS(...) \
VA_ARGS_NARGS_ EXPAND((__VA_ARGS__, \
63,62,61,60, \
59,58,57,56,55,54,53,52,51,50, \
49,48,47,46,45,44,43,42,41,40, \
39,38,37,36,35,34,33,32,31,30, \
29,28,27,26,25,24,23,22,21,20, \
19,18,17,16,15,14,13,12,11,10, \
9, 8, 7, 6, 5, 4, 3, 2, 1, 0))
#else
#define VA_ARGS_NARGS(...) \ #define VA_ARGS_NARGS(...) \
VA_ARGS_NARGS_(__VA_ARGS__, \ VA_ARGS_NARGS_(__VA_ARGS__, \
63,62,61,60, \ 63,62,61,60, \
@ -404,7 +386,6 @@
29,28,27,26,25,24,23,22,21,20, \ 29,28,27,26,25,24,23,22,21,20, \
19,18,17,16,15,14,13,12,11,10, \ 19,18,17,16,15,14,13,12,11,10, \
9, 8, 7, 6, 5, 4, 3, 2, 1, 0) 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
#endif
#define VA_ARGS_NARGS_( \ #define VA_ARGS_NARGS_( \
_01,_02,_03,_04,_05,_06,_07,_08,_09,_10, \ _01,_02,_03,_04,_05,_06,_07,_08,_09,_10, \