From fd25394d146bb83043189608d30dd0eeb983186d Mon Sep 17 00:00:00 2001 From: Frank Cusack Date: Sun, 27 Oct 2002 12:56:26 +0000 Subject: [PATCH] __linux__ (already defined by compiler) not _linux_ (manually defined) --- README.cbcp | 4 ++-- pppd/Makefile.linux | 4 ++-- pppd/auth.c | 4 ++-- pppd/plugins/Makefile.linux | 2 +- pppd/utils.c | 4 ++-- pppstats/Makefile.linux | 4 ++-- pppstats/pppstats.c | 16 ++++++++-------- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.cbcp b/README.cbcp index 5d57ecc..abf7047 100644 --- a/README.cbcp +++ b/README.cbcp @@ -87,8 +87,8 @@ diff -ur ppp-2.4.1.orig/pppd/Makefile.linux ppp-2.4.1/pppd/Makefile.linux INCLUDE_DIRS= -I../include --COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MULTILINK -DHAVE_MMAP -+COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MULTILINK -DHAVE_MMAP -DCBCP_SUPPORT +-COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MULTILINK -DHAVE_MMAP ++COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MULTILINK -DHAVE_MMAP -DCBCP_SUPPORT CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux index e3ada29..a8d01a4 100644 --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux @@ -1,6 +1,6 @@ # # pppd makefile for Linux -# $Id: Makefile.linux,v 1.52 2002/10/27 12:44:41 fcusack Exp $ +# $Id: Makefile.linux,v 1.53 2002/10/27 12:56:26 fcusack Exp $ # # Default installation locations @@ -76,7 +76,7 @@ MAXOCTETS=y INCLUDE_DIRS= -I../include -COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP +COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) diff --git a/pppd/auth.c b/pppd/auth.c index addfe87..cf04268 100644 --- a/pppd/auth.c +++ b/pppd/auth.c @@ -32,7 +32,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id: auth.c,v 1.87 2002/10/12 01:28:05 fcusack Exp $" +#define RCSID "$Id: auth.c,v 1.88 2002/10/27 12:56:26 fcusack Exp $" #include #include @@ -46,7 +46,7 @@ #include #include #include -#if defined(_PATH_LASTLOG) && defined(_linux_) +#if defined(_PATH_LASTLOG) && defined(__linux__) #include #endif diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux index 419225b..971024a 100644 --- a/pppd/plugins/Makefile.linux +++ b/pppd/plugins/Makefile.linux @@ -1,5 +1,5 @@ CC = gcc -CFLAGS = -g -O2 -I.. -I../../include -D_linux_=1 -fPIC +CFLAGS = -g -O2 -I.. -I../../include -fPIC LDFLAGS = -shared INSTALL = install -o root diff --git a/pppd/utils.c b/pppd/utils.c index 38a6977..69d2a93 100644 --- a/pppd/utils.c +++ b/pppd/utils.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id: utils.c,v 1.18 2002/03/05 15:14:04 dfs Exp $" +#define RCSID "$Id: utils.c,v 1.19 2002/10/27 12:56:26 fcusack Exp $" #include #include @@ -818,7 +818,7 @@ dump_packet(const char *tag, unsigned char *p, int len) /* Procedures for locking the serial device using a lock file. */ #ifndef LOCK_DIR -#ifdef _linux_ +#ifdef __linux__ #define LOCK_DIR "/var/lock" #else #ifdef SVR4 diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux index 4ad565a..8bb4f9a 100644 --- a/pppstats/Makefile.linux +++ b/pppstats/Makefile.linux @@ -1,6 +1,6 @@ # # pppstats makefile -# $Id: Makefile.linux,v 1.4 2002/07/25 22:21:14 dfs Exp $ +# $Id: Makefile.linux,v 1.5 2002/10/27 12:56:26 fcusack Exp $ # PPPSTATSRCS = pppstats.c @@ -8,7 +8,7 @@ PPPSTATOBJS = pppstats.o #CC = gcc COPTS = -O -COMPILE_FLAGS = -D_linux_ -I../include +COMPILE_FLAGS = -I../include LIBS = INSTALL= install -o root -g daemon diff --git a/pppstats/pppstats.c b/pppstats/pppstats.c index a0d3d7f..6367988 100644 --- a/pppstats/pppstats.c +++ b/pppstats/pppstats.c @@ -36,7 +36,7 @@ #endif #ifndef lint -static const char rcsid[] = "$Id: pppstats.c,v 1.28 2000/04/24 02:54:18 masputra Exp $"; +static const char rcsid[] = "$Id: pppstats.c,v 1.29 2002/10/27 12:56:26 fcusack Exp $"; #endif #include @@ -53,13 +53,13 @@ static const char rcsid[] = "$Id: pppstats.c,v 1.28 2000/04/24 02:54:18 masputra #include #ifndef STREAMS -#if defined(_linux_) && defined(__powerpc__) \ +#if defined(__linux__) && defined(__powerpc__) \ && (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0) /* kludge alert! */ #undef __GLIBC__ #endif #include /* *BSD, Linux, NeXT, Ultrix etc. */ -#ifndef _linux_ +#ifndef __linux__ #include #include #include @@ -74,7 +74,7 @@ static const char rcsid[] = "$Id: pppstats.c,v 1.28 2000/04/24 02:54:18 masputra #endif #include #include -#endif /* _linux_ */ +#endif /* __linux__ */ #else /* STREAMS */ #include /* SVR4, Solaris 2, SunOS 4, OSF/1, etc. */ @@ -144,7 +144,7 @@ get_ppp_stats(curp) memset (&req, 0, sizeof (req)); -#ifdef _linux_ +#ifdef __linux__ req.stats_ptr = (caddr_t) &req.stats; #undef ifr_name #define ifr_name ifr__name @@ -170,7 +170,7 @@ get_ppp_cstats(csp) memset (&creq, 0, sizeof (creq)); -#ifdef _linux_ +#ifdef __linux__ creq.stats_ptr = (caddr_t) &creq.stats; #undef ifr_name #define ifr_name ifr__name @@ -190,7 +190,7 @@ get_ppp_cstats(csp) } } -#ifdef _linux_ +#ifdef __linux__ if (creq.stats.c.bytes_out == 0) { creq.stats.c.bytes_out = creq.stats.c.comp_bytes + creq.stats.c.inc_bytes; creq.stats.c.in_count = creq.stats.c.unc_bytes; @@ -522,7 +522,7 @@ main(argc, argv) exit(1); } -#ifdef _linux_ +#ifdef __linux__ #undef ifr_name #define ifr_name ifr_ifrn.ifrn_name #endif -- 2.39.2