From a875324d9aca79cfbc46924354dcb4631d418dff Mon Sep 17 00:00:00 2001 From: Thomas Munro Date: Wed, 21 Dec 2022 15:36:46 +1300 Subject: [PATCH v3 1/2] Fix VA_ARGS_NARGS() macro on MSVC. The previous coding of VA_ARGS_NARGS() always returned 1 on MSVC. XXX Explain? Author: Victor Spirin Discussion: https://postgr.es/m/f450fc57-a147-19d0-e50c-33571c52cc13%40postgrespro.ru --- src/include/c.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/include/c.h b/src/include/c.h index bd6d8e5bf5..06f49e7592 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -325,6 +325,19 @@ * the call so that that is the appropriate one of the list of constants. * This idea is due to Laurent Deniau. */ +#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(...) \ VA_ARGS_NARGS_(__VA_ARGS__, \ 63,62,61,60, \ @@ -334,6 +347,8 @@ 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) +#endif + #define VA_ARGS_NARGS_( \ _01,_02,_03,_04,_05,_06,_07,_08,_09,_10, \ _11,_12,_13,_14,_15,_16,_17,_18,_19,_20, \ -- 2.38.1