alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix compilation on MacOS X

Browse source 
Patch by Shachar Itzhaky.

* spot/parseaut/scanaut.ll, spot/parsetl/scantl.ll: Include
libc-config.h instead of config.h.
* NEWS: Mention the fix.
* THANKS: Add Shachar.
This commit is contained in:
Alexandre Duret-Lutz 2022-05-17 09:27:30 +02:00
parent 78d7224026
commit f14b0bb4bd
4 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -7,6 +7,10 @@ New in spot 2.10.5.dev (not yet released)
print_hoa() will now use state numbers matching those of the
kripke_graph (issue #505).
Bug fixed:
- Fix compilation error on MacOS X.
New in spot 2.10.5 (2022-05-03)
Bugs fixed:

5
THANKS
View file

@ -46,10 +46,11 @@ Paul Guénézan
Reuben Rowe
Roei Nahum
Rüdiger Ehlers
Silien Hong
Simon Jantsch
Shachar Itzhaky
Shengping Shaw
Shufang Zhu
Silien Hong
Simon Jantsch
Sonali Dutta
Tereza Šťastná
Tobias Meggendorfer.

11
spot/parseaut/scanaut.ll
View file

@ -25,12 +25,15 @@
/* %option debug */
%top{
#include "config.h"
#include "libc-config.h"
/* Flex 2.6.4's test for <inttypes.h> relies on __STDC_VERSION__
which is undefined in C++. So without that, it will define
its own integer types, including a broken SIZE_MAX definition.
So let's define __STDC_VERSION__ to make sure <inttypes.h> gets
included. */
its own integer types, including a broken SIZE_MAX definition that
breaks compilation on OpenBSD. So let's define __STDC_VERSION__ to
make sure <inttypes.h> gets included. Redefining __STDC_VERSION__
this way can break all sort of macros defined in <cdefs.h>, so
we include "libc-config.h" instead of "config.h" above to define
those macros first. */
#if HAVE_INTTYPES_H && !(defined __STDC_VERSION__)
# define __STDC_VERSION__ 199901L
#endif

11
spot/parsetl/scantl.ll
View file

@ -27,12 +27,15 @@
%option never-interactive
%top{
#include "config.h"
#include "libc-config.h"
/* Flex 2.6.4's test for <inttypes.h> relies on __STDC_VERSION__
which is undefined in C++. So without that, it will define
its own integer types, including a broken SIZE_MAX definition.
So let's define __STDC_VERSION__ to make sure <inttypes.h> gets
included. */
its own integer types, including a broken SIZE_MAX definition that
breaks compilation on OpenBSD. So let's define __STDC_VERSION__ to
make sure <inttypes.h> gets included. Redefining __STDC_VERSION__
this way can break all sort of macros defined in <cdefs.h>, so
we include "libc-config.h" instead of "config.h" above to define
those macros first. */
#if HAVE_INTTYPES_H && !(defined __STDC_VERSION__)
# define __STDC_VERSION__ 199901L
#endif