diff options
| author | Sebastiano Tronto <sebastiano@tronto.net> | 2026-04-06 15:55:33 +0200 |
|---|---|---|
| committer | Sebastiano Tronto <sebastiano@tronto.net> | 2026-04-06 15:55:33 +0200 |
| commit | fc41f7917531693680b5baf71ffe38c47333fe84 (patch) | |
| tree | a6e62232e05e7779034c5f9d1bf743b6f1c198e3 /src/solvers/distribution.h | |
| parent | fe534f1497da6447153064d7bba00243000f803b (diff) | |
| download | nissy-core-fc41f7917531693680b5baf71ffe38c47333fe84.tar.gz nissy-core-fc41f7917531693680b5baf71ffe38c47333fe84.zip | |
Make the project build with Microsoft's broken C compiler.
MSVC is not fully C11-compliant, even when compiling with /std:c11.
Some changes were needed to make the codebase compatible. Notably, the
notation a[static N] and a[n] for function parameters of array type is
not supported, so that had to be hidden behind a macro. Atomic types
are also an experimental feature, apparently, but at least they work
with the correct compiler flag.
One thing that MSVC does well, however, is warning on integer conversions
on /W4 level. I am not sure if Clang and GCC have something similar,
so I took this chance to fix some of these.
Diffstat (limited to 'src/solvers/distribution.h')
| -rw-r--r-- | src/solvers/distribution.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/solvers/distribution.h b/src/solvers/distribution.h index 78b9b5e..a996e3db 100644 --- a/src/solvers/distribution.h +++ b/src/solvers/distribution.h | |||
| @@ -12,9 +12,9 @@ typedef struct { | |||
| 12 | 12 | ||
| 13 | STATIC wrapthread_return_t getdistribution_runthread(void *); | 13 | STATIC wrapthread_return_t getdistribution_runthread(void *); |
| 14 | STATIC void getdistribution(const unsigned char *, | 14 | STATIC void getdistribution(const unsigned char *, |
| 15 | uint64_t [static INFO_DISTRIBUTION_LEN], const tableinfo_t [static 1]); | 15 | uint64_t [SIZE(INFO_DISTRIBUTION_LEN)], const tableinfo_t [NON_NULL]); |
| 16 | STATIC bool distribution_equal(const uint64_t [static INFO_DISTRIBUTION_LEN], | 16 | STATIC bool distribution_equal(const uint64_t [SIZE(INFO_DISTRIBUTION_LEN)], |
| 17 | const uint64_t [static INFO_DISTRIBUTION_LEN], uint8_t); | 17 | const uint64_t [SIZE(INFO_DISTRIBUTION_LEN)], uint8_t); |
| 18 | 18 | ||
| 19 | STATIC wrapthread_return_t | 19 | STATIC wrapthread_return_t |
| 20 | getdistribution_runthread(void *arg) | 20 | getdistribution_runthread(void *arg) |
| @@ -39,8 +39,8 @@ getdistribution_runthread(void *arg) | |||
| 39 | STATIC void | 39 | STATIC void |
| 40 | getdistribution( | 40 | getdistribution( |
| 41 | const unsigned char *table, | 41 | const unsigned char *table, |
| 42 | uint64_t distr[static INFO_DISTRIBUTION_LEN], | 42 | uint64_t distr[SIZE(INFO_DISTRIBUTION_LEN)], |
| 43 | const tableinfo_t info[static 1] | 43 | const tableinfo_t info[NON_NULL] |
| 44 | ) { | 44 | ) { |
| 45 | getdistribution_data_t targ[THREADS]; | 45 | getdistribution_data_t targ[THREADS]; |
| 46 | wrapthread_define_var_thread_t(thread[THREADS]); | 46 | wrapthread_define_var_thread_t(thread[THREADS]); |
| @@ -80,8 +80,8 @@ getdistribution( | |||
| 80 | 80 | ||
| 81 | STATIC bool | 81 | STATIC bool |
| 82 | distribution_equal( | 82 | distribution_equal( |
| 83 | const uint64_t expected[static INFO_DISTRIBUTION_LEN], | 83 | const uint64_t expected[SIZE(INFO_DISTRIBUTION_LEN)], |
| 84 | const uint64_t actual[static INFO_DISTRIBUTION_LEN], | 84 | const uint64_t actual[SIZE(INFO_DISTRIBUTION_LEN)], |
| 85 | uint8_t maxvalue | 85 | uint8_t maxvalue |
| 86 | ) | 86 | ) |
| 87 | { | 87 | { |
