Merge in 1.3 and post 1.3 fixes; some of them might be applicable to

[ppp.git] / pppd / sys-linux.c

diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
index 6d994a5baf16a8752f4d74fe17ddb27a5a060399..29aa77fef300b9d3ef69334848723bb359825452 100644 (file)
--- a/pppd/sys-linux.c
+++ b/pppd/sys-linux.c
@@ -51,11 +51,13 @@
 #endif
 
 #if __GLIBC__ >= 2
+#include <asm/types.h>         /* glibc 2 conflicts with linux/types.h */
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <net/route.h>
 #include <netinet/if_ether.h>
 #else
+#include <linux/types.h>
 #include <linux/if.h>
 #include <linux/if_arp.h>
 #include <linux/route.h>
@@ -64,7 +66,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <linux/types.h>
 #include <linux/ppp_defs.h>
 #include <linux/if_ppp.h>