40 lines
874 B
Diff
40 lines
874 B
Diff
--- a/pppd/sys-linux.c
|
|
+++ b/pppd/sys-linux.c
|
|
@@ -73,12 +73,12 @@
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/time.h>
|
|
-#include <sys/errno.h>
|
|
#include <sys/file.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/utsname.h>
|
|
#include <sys/sysmacros.h>
|
|
|
|
+#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <syslog.h>
|
|
@@ -102,22 +102,15 @@
|
|
#define MAX_ADDR_LEN 7
|
|
#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>
|
|
-#include <linux/if_ether.h>
|
|
-#endif
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
|
|
+#include <linux/sockios.h>
|
|
#include <linux/ppp_defs.h>
|
|
#include <linux/if_ppp.h>
|
|
|