Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | From 460549a3de27f8dd8371b6d6fc1f69d8bffa102b Mon Sep 17 00:00:00 2001 |
| 2 | From: Joe MacDonald <joe_macdonald@mentor.com> |
| 3 | Date: Tue, 6 Jan 2015 11:23:21 -0500 |
| 4 | Subject: [PATCH] openl2tp: simplify gcc warning hack |
| 5 | |
| 6 | The hack to work around the gcc warning causes problems with some modern |
| 7 | gcc configurations. Since the redef behaviour is essentially correct |
| 8 | everywhere and since the hack is still required on 32-bit builders, leave |
| 9 | it in place but remove the #if guard since it is only there to ensure that |
| 10 | the l2tp_private.h file is updated if the rpc source file is changed and |
| 11 | the two get out of sync. |
| 12 | |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 13 | Upstream-Status: Pending |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 14 | |
| 15 | Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> |
| 16 | --- |
| 17 | l2tp_private.h | 6 ------ |
| 18 | 1 file changed, 6 deletions(-) |
| 19 | |
| 20 | diff --git a/l2tp_private.h b/l2tp_private.h |
| 21 | index f3c1af7..cca6806 100644 |
| 22 | --- a/l2tp_private.h |
| 23 | +++ b/l2tp_private.h |
| 24 | @@ -89,14 +89,8 @@ |
| 25 | * So we redefine the constant with UL suffix to avoid the gcc warning. |
| 26 | * Is there some C preprocessor magic that could avoid having to do this? |
| 27 | */ |
| 28 | -#if L2TP_API_TUNNEL_FLAG_MTU != 2147483648 |
| 29 | -#error Constant L2TP_API_TUNNEL_FLAG_MTU changed. Update local definition here. |
| 30 | -#endif |
| 31 | #undef L2TP_API_TUNNEL_FLAG_MTU |
| 32 | #define L2TP_API_TUNNEL_FLAG_MTU 2147483648UL |
| 33 | -#if L2TP_API_SESSION_FLAG_NO_PPP != 2147483648 |
| 34 | -#error Constant L2TP_API_SESSION_FLAG_NO_PPP changed. Update local definition here. |
| 35 | -#endif |
| 36 | #undef L2TP_API_SESSION_FLAG_NO_PPP |
| 37 | #define L2TP_API_SESSION_FLAG_NO_PPP 2147483648UL |
| 38 | |
| 39 | -- |
| 40 | 1.9.1 |
| 41 | |