Messages in this thread Patch in this message | | | Date | Tue, 29 Jul 1997 17:59:07 -0700 (PDT) | From | Trevor Johnson <> | Subject | Re: [patch] ppp-2.2f/2.3.x, glibc 2, and Linux 2.x |
| |
Richard Henderson writes:
> Yikes! No. Never touch a bits file directly. For glibc 2.1 we've > made this a bit more explicit by moving them into /usr/include/bits/ > and issuing #errors if we aren't being included from the right place. > > That particular file gets pulled in by <termios.h>, btw. > > > - there was a ^L in that same file which seemed to be causing problems. > > For gcc? Not likely, the gcc sources themselves are full of ^Ls. [...] > Not exactly sure when they were added, but for glibc 2.0.4 at least, > try including <net/if.h> etc, just like the rest of the non-linux > world does.
Thank you for your suggestions. They all worked--here's a revised patch for ppp-2.3.1 which leaves the kernel sources alone. ___ Trevor Johnson diff -u -r ppp-2.3.1/pppd/sys-linux.c ppp-2.3.1-glibc/pppd/sys-linux.c --- ppp-2.3.1/pppd/sys-linux.c Fri Jun 27 05:05:12 1997 +++ ppp-2.3.1-glibc/pppd/sys-linux.c Tue Jul 29 17:46:00 1997 @@ -37,6 +37,7 @@ #include <signal.h> #include <fcntl.h> #include <ctype.h> +#include <termios.h> /* This is in netdevice.h. However, this compile will fail miserably if you attempt to include netdevice.h because it has so many references @@ -47,14 +48,13 @@ #define MAX_ADDR_LEN 7 #endif -#include <linux/version.h> #include <net/if.h> -#include <linux/ppp_defs.h> #include <net/if_arp.h> -#include <linux/if_ppp.h> +#include <net/if_ppp.h> #include <net/route.h> -#include <linux/if_ether.h> +#include <netinet/if_ether.h> #include <netinet/in.h> +#include <net/ppp_defs.h> #include "pppd.h" #include "fsm.h" | |