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 013c879b41
commit 3b809c0a14
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

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

5
THANKS
View file

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

11
spot/parseaut/scanaut.ll
View file

@ -25,12 +25,15 @@
/* %option debug */ /* %option debug */
%top{ %top{
#include "config.h" #include "libc-config.h"
/* Flex 2.6.4's test for <inttypes.h> relies on __STDC_VERSION__ /* Flex 2.6.4's test for <inttypes.h> relies on __STDC_VERSION__
which is undefined in C++. So without that, it will define which is undefined in C++. So without that, it will define
its own integer types, including a broken SIZE_MAX definition. its own integer types, including a broken SIZE_MAX definition that
So let's define __STDC_VERSION__ to make sure <inttypes.h> gets breaks compilation on OpenBSD. So let's define __STDC_VERSION__ to
included. */ 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__) #if HAVE_INTTYPES_H && !(defined __STDC_VERSION__)
# define __STDC_VERSION__ 199901L # define __STDC_VERSION__ 199901L
#endif #endif

11
spot/parsetl/scantl.ll
View file

@ -27,12 +27,15 @@
%option never-interactive %option never-interactive
%top{ %top{
#include "config.h" #include "libc-config.h"
/* Flex 2.6.4's test for <inttypes.h> relies on __STDC_VERSION__ /* Flex 2.6.4's test for <inttypes.h> relies on __STDC_VERSION__
which is undefined in C++. So without that, it will define which is undefined in C++. So without that, it will define
its own integer types, including a broken SIZE_MAX definition. its own integer types, including a broken SIZE_MAX definition that
So let's define __STDC_VERSION__ to make sure <inttypes.h> gets breaks compilation on OpenBSD. So let's define __STDC_VERSION__ to
included. */ 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__) #if HAVE_INTTYPES_H && !(defined __STDC_VERSION__)
# define __STDC_VERSION__ 199901L # define __STDC_VERSION__ 199901L
#endif #endif