Fix conflicting C function definitions #1812
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Declare the function signatures instead of importing system definitions. This avoids conflict between our pre-build libraries and the C files that are built on the user machine. Also remove the gen_c_lib.c file which seems to be dead code. Fixes model-checking#1774
tautschnig
reviewed
Oct 28, 2022
library/kani/kani_lib.c
Outdated
| @@ -1,12 +1,14 @@ | |||
| // Copyright Kani Contributors | |||
| // SPDX-License-Identifier: Apache-2.0 OR MIT | |||
|
|
|||
| #include <assert.h> | |||
| #include <stdbool.h> | |||
There was a problem hiding this comment.
While at it: do you really need/want to keep this one? I'd suggest you use __CPROVER_bool instead of bool.
There was a problem hiding this comment.
yeah, I can do that.
There was a problem hiding this comment.
Should I also use __CPROVER_size_t?
There was a problem hiding this comment.
Good idea, though you’ll still need the header for uint8_t.
There was a problem hiding this comment.
Yeah, I noticed that. I ended up just replacing the bool but I can replace size_t too.
tedinski
approved these changes
Oct 28, 2022
celinval
force-pushed
the
issue-1774-nixos
branch
from
bc3181d to
e1e9bef
Compare
tautschnig
added a commit
to tautschnig/kani
that referenced
this pull request
Jun 27, 2024
In model-checking#1812 we removed standard library includes and instead provided forward declarations of `free`, `calloc`, and `memcpy` -- but seemingly forgot to include `malloc`, which we also use. This avoids a warning seen when dialling up `goto-cc` verbosity.
celinval
pushed a commit
that referenced
this pull request
Jun 27, 2024
In #1812 we removed standard library includes and instead provided forward declarations of `free`, `calloc`, and `memcpy` -- but seemingly forgot to include `malloc`, which we also use. This avoids a warning seen when dialling up `goto-cc` verbosity.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
Declare the function signatures instead of importing system definitions. This avoids conflict between our pre-build libraries and the C files that are built on the user machine.
Also remove the gen_c_lib.c file which seems to be dead code.
Resolved issues:
Fixes #1774
Related RFC:
Call-outs:
Testing:
How is this change tested? Existing tests + manually tested on NixOs
Is this a refactor change? No
Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.