1From 460549a3de27f8dd8371b6d6fc1f69d8bffa102b Mon Sep 17 00:00:00 2001
2From: Joe MacDonald <joe_macdonald@mentor.com>
3Date: Tue, 6 Jan 2015 11:23:21 -0500
4Subject: [PATCH] openl2tp: simplify gcc warning hack
5
6The hack to work around the gcc warning causes problems with some modern
7gcc configurations.  Since the redef behaviour is essentially correct
8everywhere and since the hack is still required on 32-bit builders, leave
9it in place but remove the #if guard since it is only there to ensure that
10the l2tp_private.h file is updated if the rpc source file is changed and
11the two get out of sync.
12
13Upstream-Status: Pending
14
15Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
16---
17 l2tp_private.h | 6 ------
18 1 file changed, 6 deletions(-)
19
20diff --git a/l2tp_private.h b/l2tp_private.h
21index 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--
401.9.1
41
42