diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | include/limits.h | 6 | ||||
| -rw-r--r-- | include/rpc/rpc.h | 2 | ||||
| -rw-r--r-- | include/rpc/svc.h | 3 | ||||
| -rw-r--r-- | libc/inet/Makefile | 2 | ||||
| -rw-r--r-- | libc/inet/rpc/Makefile | 1 | ||||
| -rw-r--r-- | libc/inet/rpc/get_myaddress.c | 2 | ||||
| -rw-r--r-- | libc/inet/rpc/pmap_getmaps.c | 2 | ||||
| -rw-r--r-- | libc/inet/rpc/pmap_getport.c | 2 | ||||
| -rw-r--r-- | libc/inet/rpc/pmap_rmt.c | 2 | ||||
| -rw-r--r-- | libc/misc/time/Makefile | 2 | ||||
| -rw-r--r-- | libc/stdlib/malloc/Makefile | 2 |
12 files changed, 12 insertions, 16 deletions
@@ -60,5 +60,5 @@ dummy: clean: -rm -f `find -name \*.[oa]` `find -name \*~` core - -rm include/asm include/net include/linux + -rm -f include/asm include/net include/linux diff --git a/include/limits.h b/include/limits.h index 8b59c8208..e03e558fd 100644 --- a/include/limits.h +++ b/include/limits.h @@ -39,10 +39,7 @@ Cambridge, MA 02139, USA. */ * #include_next. #if __GNUC__ >= 2 && __STDC__ */ -#if __GNUC__ >= 2 - - /* Have we done that? */ -# if !defined(_GCC_LIMITS_H_) && !defined(_GCC_LIMITS_H) +#if __GNUC__ >= 2 && !defined(_GCC_LIMITS_H_) && !defined(_GCC_LIMITS_H) /* Get the compiler's limits.h, which defines all the ANSI * constants. */ @@ -50,7 +47,6 @@ Cambridge, MA 02139, USA. */ # define _LIBC_LIMITS_H # define _LIBC_LIMITS_H_ # include_next <limits.h> -# endif #else /* Not GCC 2. */ diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h index 1edf4a334..f1da8fa7f 100644 --- a/include/rpc/rpc.h +++ b/include/rpc/rpc.h @@ -60,7 +60,7 @@ * Uncomment-out the next line if you are building the rpc library with * DES Authentication (see the README file in the secure_rpc/ directory). */ -/*#include <rpc/auth_des.h> /* protocol for des style cred */ +/*#include <rpc/auth_des.h>*/ /* protocol for des style cred */ /* Server side only remote procedure callee */ #include <rpc/svc.h> /* service manager and multiplexer */ diff --git a/include/rpc/svc.h b/include/rpc/svc.h index 3cb07ef3f..a36a24ba0 100644 --- a/include/rpc/svc.h +++ b/include/rpc/svc.h @@ -151,8 +151,7 @@ struct svc_req { * u_long prog; * u_long vers; * void (*dispatch)(); - * int protocol; /* like TCP or UDP, zero means do not register - */ + * int protocol; */ /* like TCP or UDP, zero means do not register*/ extern bool_t svc_register(); /* diff --git a/libc/inet/Makefile b/libc/inet/Makefile index 1e954307f..14afc1763 100644 --- a/libc/inet/Makefile +++ b/libc/inet/Makefile @@ -5,7 +5,7 @@ # under the GNU Library General Public License. TOPDIR=../ -include Rules.make +include $(TOPDIR)Rules.make LIBC=../libc.a diff --git a/libc/inet/rpc/Makefile b/libc/inet/rpc/Makefile index b2d7c6d4a..e2c867703 100644 --- a/libc/inet/rpc/Makefile +++ b/libc/inet/rpc/Makefile @@ -1,5 +1,6 @@ TOPDIR=../ include $(TOPDIR)Rules.make +CFLAGS+=-I$(TOPDIR)include/linux OBJS = auth_none.o auth_unix.o authunix_prot.o \ bindresvport.o clnt_generic.o clnt_perror.o \ diff --git a/libc/inet/rpc/get_myaddress.c b/libc/inet/rpc/get_myaddress.c index 1940d3e27..cbfc05b8d 100644 --- a/libc/inet/rpc/get_myaddress.c +++ b/libc/inet/rpc/get_myaddress.c @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)get_myaddress.c 1.4 87/08/11 Copyr 1984 Sun Micro"; #include <rpc/pmap_prot.h> #include <sys/socket.h> #include <stdio.h> -#include <net/if.h> +//#include <net/if.h> #include <sys/ioctl.h> #include <arpa/inet.h> #include <netinet/in.h> diff --git a/libc/inet/rpc/pmap_getmaps.c b/libc/inet/rpc/pmap_getmaps.c index e4a9c4936..98803d3c5 100644 --- a/libc/inet/rpc/pmap_getmaps.c +++ b/libc/inet/rpc/pmap_getmaps.c @@ -46,7 +46,7 @@ static char sccsid[] = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro"; #include <netdb.h> #include <stdio.h> #include <errno.h> -#include <net/if.h> +//#include <net/if.h> #include <sys/ioctl.h> #define NAMELEN 255 #define MAX_BROADCAST_SIZE 1400 diff --git a/libc/inet/rpc/pmap_getport.c b/libc/inet/rpc/pmap_getport.c index 77b9cf743..5eb2eee3b 100644 --- a/libc/inet/rpc/pmap_getport.c +++ b/libc/inet/rpc/pmap_getport.c @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro"; #include <rpc/pmap_prot.h> #include <rpc/pmap_clnt.h> #include <sys/socket.h> -#include <net/if.h> +//#include <net/if.h> static struct timeval timeout = { 5, 0 }; static struct timeval tottimeout = { 60, 0 }; diff --git a/libc/inet/rpc/pmap_rmt.c b/libc/inet/rpc/pmap_rmt.c index 336d0c112..1921b74c1 100644 --- a/libc/inet/rpc/pmap_rmt.c +++ b/libc/inet/rpc/pmap_rmt.c @@ -46,7 +46,7 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro"; #include <sys/socket.h> #include <stdio.h> #include <errno.h> -#include <net/if.h> +//#include <net/if.h> #include <sys/ioctl.h> #include <arpa/inet.h> #define MAX_BROADCAST_SIZE 1400 diff --git a/libc/misc/time/Makefile b/libc/misc/time/Makefile index ce2351ddf..7d648f867 100644 --- a/libc/misc/time/Makefile +++ b/libc/misc/time/Makefile @@ -5,7 +5,7 @@ TOPDIR=../ include $(TOPDIR)Rules.make -CFLAGS+=-I$(TOPDIR)/include/linux +CFLAGS+=-I$(TOPDIR)include/linux LIBC=../libc.a diff --git a/libc/stdlib/malloc/Makefile b/libc/stdlib/malloc/Makefile index 368adb797..eecfd3203 100644 --- a/libc/stdlib/malloc/Makefile +++ b/libc/stdlib/malloc/Makefile @@ -3,7 +3,7 @@ # under the GNU Library General Public License. TOPDIR=../ -include Rules.make +include $(TOPDIR)Rules.make LIBC=../libc.a |