| 1 | From 58f62c9e09d5a239b2502469923c6d87a227d9de Mon Sep 17 00:00:00 2001
|
| 2 | From: Bram Vandenbogaerde <[email protected]>
|
| 3 | Date: Tue, 24 Sep 2024 22:46:53 +0200
|
| 4 | Subject: [PATCH] fix: stop redefining the GHC version to fix incompatibilities
|
| 5 | between Int# and Int32# in happy
|
| 6 |
|
| 7 | https://github.com/paul-rouse/mysql-simple/pull/61
|
| 8 |
|
| 9 | ---
|
| 10 | src/Language/Python/Version2/Parser/Parser.y | 5 ++++-
|
| 11 | src/Language/Python/Version3/Parser/Parser.y | 4 ++++
|
| 12 | 2 files changed, 8 insertions(+), 1 deletion(-)
|
| 13 |
|
| 14 | diff --git a/src/Language/Python/Version2/Parser/Parser.y b/src/Language/Python/Version2/Parser/Parser.y
|
| 15 | index b06d47e..b312349 100644
|
| 16 | |
| 17 | |
| 18 | @@ -1,8 +1,11 @@
|
| 19 | {
|
| 20 | {-# LANGUAGE CPP #-}
|
| 21 |
|
| 22 | -#undef __GLASGOW_HASKELL__
|
| 23 | +-- For legacy reasons
|
| 24 | +#if __GLASGOW_HASKELL__ < 901
|
| 25 | +#undef __GLASGOW_HASKELL_
|
| 26 | #define __GLASGOW_HASKELL__ 709
|
| 27 | +#endif
|
| 28 | -----------------------------------------------------------------------------
|
| 29 | -- |
|
| 30 | -- Module : Language.Python.Version2.Parser.Parser
|
| 31 | diff --git a/src/Language/Python/Version3/Parser/Parser.y b/src/Language/Python/Version3/Parser/Parser.y
|
| 32 | index 214faeb..d473be4 100644
|
| 33 | |
| 34 | |
| 35 | @@ -1,8 +1,12 @@
|
| 36 | {
|
| 37 | {-# LANGUAGE CPP #-}
|
| 38 |
|
| 39 | +-- For legacy reasons
|
| 40 | +#if __GLASGOW_HASKELL__ < 901
|
| 41 | #undef __GLASGOW_HASKELL__
|
| 42 | #define __GLASGOW_HASKELL__ 709
|
| 43 | +#endif
|
| 44 | +
|
| 45 | -----------------------------------------------------------------------------
|
| 46 | -- |
|
| 47 | -- Module : Language.Python.Version3.Parser.Parser
|