GitList

Browse code

test_options_parse: Do not use uintmax_t instead of LargestIntegralType

At least on OpenBSD it seems that uintmax_t maps
to unsigned long long always, but LargestIntegralType
is unsigned long. So if we have a version of cmocka.h
that defines LargestIntegralType then respect that.

Change-Id: I59a49696acd665d43b21e5c23f24b86c15989cd6
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1256
Message-Id: <20251008133338.23652-1-gert@greenie.muc.de>
URL: https://sourceforge.net/p/openvpn/mailman/message/59243971/
Signed-off-by: Gert Doering <gert@greenie.muc.de>

Frank Lichtenheld authored on 2025/10/08 22:33:31
Showing 1 changed files

tests/unit_tests/openvpn/test_options_parse.c

History View file @ 5b8e056

@@ -198,14 +198,25 @@ read_single_config(struct options *options, const char *config)
                                             &option_types_found, &es);
+                     }
                     +/* compat with various versions of cmocka.h
                     + * Older versions have LargestIntegralType. Newer
                     + * versions use uintmax_t. But LargestIntegralType
                     + * is not guaranteed to be equal to uintmax_t, so
                     + * we can't use that unconditionally. So we only use
                     + * it if cmocka.h does not define LargestIntegralType.
                     + */
                     +#ifndef LargestIntegralType
                     +#define LargestIntegralType uintmax_t
                     +#endif
+                    +
                      union tokens_parameter
+                     {
                     -    uintmax_t as_int;
                     +    LargestIntegralType as_int;
                          void *as_pointer;
                      };
                      static int
                     -check_tokens(const uintmax_t value, const uintmax_t expected)
                     +check_tokens(const LargestIntegralType value, const LargestIntegralType expected)
+                     {
                          union tokens_parameter temp;
                          temp.as_int = value;