From 9c2e2250045552b78f0306d7aa69ebc486d9e8cf Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 30 Jun 2019 21:12:42 +0200 Subject: [PATCH] argmatch: Fix compilation errors. * lib/argmatch.h: Include , for INT_MAX. * tests/test-argmatch.c (main): Update after last-minute function names change. --- ChangeLog | 7 +++++++ lib/argmatch.h | 1 + tests/test-argmatch.c | 8 ++++---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a183dd42d4..8e94611dba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2019-06-30 Bruno Haible + + argmatch: Fix compilation errors. + * lib/argmatch.h: Include , for INT_MAX. + * tests/test-argmatch.c (main): Update after last-minute function names + change. + 2019-06-30 Bruno Haible Include when needed. diff --git a/lib/argmatch.h b/lib/argmatch.h index 46a452cdaa..d185499423 100644 --- a/lib/argmatch.h +++ b/lib/argmatch.h @@ -22,6 +22,7 @@ #ifndef ARGMATCH_H_ # define ARGMATCH_H_ 1 +# include # include # include # include diff --git a/tests/test-argmatch.c b/tests/test-argmatch.c index 0d19e97956..11b5819eaf 100644 --- a/tests/test-argmatch.c +++ b/tests/test-argmatch.c @@ -104,13 +104,13 @@ main (int argc, char *argv[]) #define CHECK(Input, Output) \ do { \ ASSERT (ARGMATCH (Input, backup_args, backup_vals) == Output); \ - ASSERT (argmatch_backup_value (Input) == Output); \ + ASSERT (argmatch_backup_choice (Input) == Output); \ if (0 <= Output) \ { \ enum backup_type val = argmatch_backup_args[Output].val; \ - ASSERT (*argmatch_backup_xvalue ("test", Input) == val); \ - ASSERT (*argmatch_backup_xvalue ("test", \ - argmatch_backup_argument (&val)) \ + ASSERT (*argmatch_backup_value ("test", Input) == val); \ + ASSERT (*argmatch_backup_value ("test", \ + argmatch_backup_argument (&val)) \ == val); \ } \ } while (0) -- 2.39.5