From 08dd32d32dc39e3c42d96bea21ff800dbebb8e57 Mon Sep 17 00:00:00 2001
From: Sylvain Rochet <gradator@gradator.net>
Date: Fri, 4 Apr 2014 20:42:01 +0200
Subject: [PATCH] PPP, most PPP headers are using u_long, u_int, u_short and
 u_char types, moved typedef of those types before we include any PPP header

---
 src/include/netif/ppp/ppp.h      | 12 +++++++++++-
 src/include/netif/ppp/ppp_impl.h |  8 --------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/include/netif/ppp/ppp.h b/src/include/netif/ppp/ppp.h
index 64fb0592..cda32ba0 100644
--- a/src/include/netif/ppp/ppp.h
+++ b/src/include/netif/ppp/ppp.h
@@ -48,7 +48,6 @@
 #include "lwip/ip6_addr.h"
 #endif /* PPP_IPV6_SUPPORT */
 
-#include "vj.h"
 
 
 /*************************
@@ -117,6 +116,14 @@
  */
 typedef struct ppp_pcb_s ppp_pcb;
 
+/* Type definitions for BSD code. */
+#ifndef __u_char_defined
+typedef unsigned long  u_long;
+typedef unsigned int   u_int;
+typedef unsigned short u_short;
+typedef unsigned char  u_char;
+#endif
+
 #include "fsm.h"
 #include "lcp.h"
 #include "ipcp.h"
@@ -132,6 +139,9 @@ typedef struct ppp_pcb_s ppp_pcb;
 #if EAP_SUPPORT
 #include "eap.h"
 #endif /* EAP_SUPPORT */
+#if VJ_SUPPORT
+#include "vj.h"
+#endif /* VJ_SUPPORT */
 
 #if PPPOE_SUPPORT
 #include "netif/ppp/pppoe.h"
diff --git a/src/include/netif/ppp/ppp_impl.h b/src/include/netif/ppp/ppp_impl.h
index 6e02290b..595ba3a6 100644
--- a/src/include/netif/ppp/ppp_impl.h
+++ b/src/include/netif/ppp/ppp_impl.h
@@ -47,14 +47,6 @@
 #include "lwip/timers.h"
 #include "lwip/sio.h"
 
-/* Type definitions for BSD code. */
-#ifndef __u_char_defined
-typedef unsigned long  u_long;
-typedef unsigned int   u_int;
-typedef unsigned short u_short;
-typedef unsigned char  u_char;
-#endif
-
 #include "ppp.h"
 #include "pppdebug.h"