tacit/minix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of includes in libcompat_minix

Browse Source 
. move configfile.h to minix/include/
	. all others are unneeded as they point to other files

Change-Id: I37d8cf3fa273f668b2615994f6d44780cefb01de
This commit is contained in:
Ben Gras 2014-08-25 00:19:51 +02:00
parent 5821d1a64e
commit 22ec4ddb7a
41 changed files with 37 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distrib/sets/lists/minix/md.evbarm
View File

@ -40,7 +40,7 @@
./usr/include/arm/bswap.h minix-sys
./usr/include/arm/byte_swap.h minix-sys
./usr/include/arm/cdefs.h minix-sys
./usr/include/arm/compat_jmp_buf.h minix-sys
./usr/include/arm/compat_jmp_buf.h minix-sys obsolete
./usr/include/arm/cpuconf.h minix-sys
./usr/include/arm/cpu.h minix-sys
./usr/include/arm/disklabel.h minix-sys

2
distrib/sets/lists/minix/md.i386
View File

@ -69,7 +69,7 @@
./usr/include/i386/byte_swap.h minix-sys
./usr/include/i386/cdefs.h minix-sys
./usr/include/i386/cmos.h minix-sys
./usr/include/i386/compat_jmp_buf.h minix-sys
./usr/include/i386/compat_jmp_buf.h minix-sys obsolete
./usr/include/i386/cpu.h minix-sys
./usr/include/i386/disklabel.h minix-sys
./usr/include/i386/diskparm.h minix-sys

8
distrib/sets/lists/minix/mi
View File

@ -1421,12 +1421,12 @@
./usr/include/net/gen/in.h minix-sys
./usr/include/net/gen/ip_hdr.h minix-sys
./usr/include/net/gen/ip_io.h minix-sys
./usr/include/net/gen/nameser.h minix-sys
./usr/include/net/gen/netdb.h minix-sys
./usr/include/net/gen/nameser.h minix-sys obsolete
./usr/include/net/gen/netdb.h minix-sys obsolete
./usr/include/net/gen/oneCsum.h minix-sys
./usr/include/net/gen/psip_hdr.h minix-sys
./usr/include/net/gen/psip_io.h minix-sys
./usr/include/net/gen/resolv.h minix-sys
./usr/include/net/gen/resolv.h minix-sys obsolete
./usr/include/net/gen/rip.h minix-sys
./usr/include/net/gen/route.h minix-sys
./usr/include/net/gen/socket.h minix-sys
@ -1633,7 +1633,7 @@
./usr/include/sys/ioctl.h minix-sys
./usr/include/sys/iostat.h minix-sys
./usr/include/sys/ipc.h minix-sys
./usr/include/sys/jmp_buf.h minix-sys
./usr/include/sys/jmp_buf.h minix-sys obsolete
./usr/include/sys/joystick.h minix-sys
./usr/include/sys/kbdio.h minix-sys
./usr/include/sys/kcore.h minix-sys

2
minix/commands/add_route/add_route.c
View File

@ -15,7 +15,7 @@ Created August 7, 1991 by Philip Homburg
#include <net/hton.h>
#include <net/netlib.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/in.h>
#include <net/gen/inet.h>
#include <net/gen/route.h>

2
minix/commands/arp/arp.c
View File

@ -25,7 +25,7 @@ Manipulate ARP table
#include <net/gen/in.h>
#include <net/gen/inet.h>
#include <net/gen/ip_io.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/socket.h>
#include <net/gen/arp_io.h>

2
minix/commands/dhcpd/dhcpd.c
View File

@ -18,7 +18,7 @@
#include <sys/asynchio.h>
#include <net/hton.h>
#include <net/gen/socket.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/in.h>
#include <net/gen/inet.h>
#include <net/gen/ether.h>

2
minix/commands/dhcpd/tags.c
View File

@ -18,7 +18,7 @@
#include <sys/asynchio.h>
#include <net/hton.h>
#include <net/gen/socket.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/in.h>
#include <net/gen/inet.h>
#include <net/gen/ether.h>

7
minix/commands/hostaddr/hostaddr.c
View File

@ -26,10 +26,11 @@ Created: Jan 27, 1992 by Philip Homburg
#include <net/gen/in.h>
#include <net/gen/inet.h>
#include <net/gen/ip_io.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/socket.h>
#include <net/gen/nameser.h>
#include <net/gen/resolv.h>
#include <arpa/nameser.h>
#include <resolv.h>
#include <net/gen/dhcp.h>
#include <minix/paths.h>

2
minix/commands/irdpd/irdpd.c
View File

@ -27,7 +27,7 @@
#include <net/gen/icmp_hdr.h>
#include <net/gen/ip_io.h>
#include <net/gen/inet.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/oneCsum.h>
#include <net/gen/socket.h>
#include <net/gen/udp.h>

6
minix/commands/nonamed/nonamed.c
View File

@ -32,9 +32,9 @@ static const char version[] = "2.7";
#include <net/netlib.h>
#include <net/gen/in.h>
#include <net/gen/inet.h>
#include <net/gen/nameser.h>
#include <net/gen/resolv.h>
#include <net/gen/netdb.h>
#include <arpa/nameser.h>
#include <resolv.h>
#include <netdb.h>
#include <net/gen/socket.h>
#include <net/gen/tcp.h>
#include <net/gen/tcp_io.h>

2
minix/commands/pr_routes/pr_routes.c
View File

@ -19,7 +19,7 @@ vmd/cmd/simple/pr_routes.c
#include <net/gen/in.h>
#include <net/gen/ip_io.h>
#include <net/gen/route.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/inet.h>
#define N_IF 64 /* More than enough? */

4
minix/commands/rarpd/rarpd.c
View File

@ -28,14 +28,14 @@ Changed: Dec 11, 2000 by Kees J. Bot
#include <sys/asynchio.h>
#include <net/hton.h>
#include <net/gen/socket.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/in.h>
#include <net/gen/inet.h>
#include <net/gen/ether.h>
#include <net/gen/eth_io.h>
#include <net/gen/if_ether.h>
#include <net/gen/ip_io.h>
#include <net/gen/nameser.h>
#include <arpa/nameser.h>
#define MAX_RARP_RETRIES 5
#define RARP_TIMEOUT 5

2
minix/commands/rcp/rcp.c
View File

@ -41,7 +41,7 @@ static char sccsid[] = "@(#)rcp.c 1.1 87/12/21 SMI"; /* from UCB 5.3 6/8/85"*/
#include <signal.h>
#include <unistd.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/netlib.h>
#if __STDC__

2
minix/commands/rget/rget.c
View File

@ -18,7 +18,7 @@
#if __minix
#include <net/gen/in.h>
#include <net/gen/inet.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/socket.h>
#include <net/gen/tcp.h>
#include <net/gen/tcp_hdr.h>

2
minix/commands/rlogin/rlogin.c
View File

@ -59,7 +59,7 @@ static char sccsid[] = "@(#)rlogin.c 5.33 (Berkeley) 3/1/91";
#include <net/netlib.h>
#include <net/hton.h>
#include <net/gen/in.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/tcp.h>
#include <net/gen/tcp_io.h>

2
minix/commands/rsh/rsh.c
View File

@ -60,7 +60,7 @@ static char sccsid[] = "@(#)rsh.c 5.24 (Berkeley) 7/1/91";
#include <unistd.h>
#include <net/netlib.h>
#include <net/gen/netdb.h>
#include <netdb.h>
int main( int argc, char *argv[] );
void usage( void );
char *copyargs( char **argv );

2
minix/commands/rshd/rshd.c
View File

@ -30,7 +30,7 @@ in.rshd.c
#include <sys/ioctl.h>
#include <net/gen/in.h>
#include <net/gen/inet.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/socket.h>
#include <net/gen/tcp.h>
#include <net/gen/tcp_io.h>

2
minix/commands/swifi/socket.c
View File

@ -24,7 +24,7 @@ Open a TCP connection
#include <net/netlib.h>
#include <net/gen/in.h>
#include <net/gen/inet.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/socket.h>
#include <net/gen/tcp.h>
#include <net/gen/tcp_io.h>

2
minix/commands/syslogd/syslogd.c
View File

@ -102,7 +102,7 @@
#include <net/gen/in.h>
#include <net/gen/udp.h>
#include <net/gen/udp_io.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#define SYSLOG_NAMES
#include <syslog.h>

2
minix/commands/tcpd/tcpd.c
View File

@ -19,7 +19,7 @@ tcpd.c
#include <net/netlib.h>
#include <net/gen/in.h>
#include <net/gen/inet.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/tcp.h>
#include <net/gen/tcp_io.h>

2
minix/commands/tcpdp/tcpd.c
View File

@ -19,7 +19,7 @@ tcpd.c
#include <net/netlib.h>
#include <net/gen/in.h>
#include <net/gen/inet.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/tcp.h>
#include <net/gen/tcp_io.h>

2
minix/commands/tcpstat/tcpstat.c
View File

@ -21,7 +21,7 @@ Created: June 1995 by Philip Homburg <philip@f-mnx.phicoh.com>
#endif
#include <net/netlib.h>
#include <net/gen/inet.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/socket.h>
#include <minix/queryparam.h>
#include <minix/com.h>

2
minix/commands/telnet/ttn.c
View File

@ -18,7 +18,7 @@ ttn.c
#include <net/netlib.h>
#include <net/gen/in.h>
#include <net/gen/inet.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/tcp.h>
#include <net/gen/tcp_io.h>
#include "ttn.h"

2
minix/commands/telnetd/main.c
View File

@ -33,7 +33,7 @@
#include <net/gen/tcp.h>
#include <net/gen/tcp_io.h>
#include <net/gen/socket.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/inet.h>
#include "telnetd.h"

2
minix/commands/udpstat/udpstat.c
View File

@ -22,7 +22,7 @@ Created: March 2001 by Philip Homburg <philip@f-mnx.phicoh.com>
#endif
#include <net/netlib.h>
#include <net/gen/inet.h>
#include <net/gen/netdb.h>
#include <netdb.h>
#include <net/gen/socket.h>
#include <minix/queryparam.h>

2
minix/include/Makefile
View File

@ -2,7 +2,7 @@
NOOBJ= # defined
INCS+= env.h fetch.h lib.h libutil.h varargs.h
INCS+= env.h fetch.h lib.h libutil.h varargs.h configfile.h
.include <bsd.own.mk>

0
minix/lib/libcompat_minix/include/configfile.h → minix/include/configfile.h
View File

2
minix/lib/libcompat_minix/Makefile
View File

@ -20,7 +20,7 @@ SRCS+= configfile.c
# NetBSD's 'mtab' format.
SRCS+= mtab.c
SUBDIR+= pkgconfig include
SUBDIR+= pkgconfig
.include <bsd.lib.mk>
.include <bsd.subdir.mk>

12
minix/lib/libcompat_minix/include/Makefile
View File

@ -1,12 +0,0 @@
INCSDIR= /usr/include
INCS+= configfile.h
NOOBJ= # defined
SUBDIR+= ${MACHINE_ARCH}
SUBDIR+= net sys
.include <bsd.prog.mk>
.include <bsd.subdir.mk>

8
minix/lib/libcompat_minix/include/earm/Makefile
View File

@ -1,8 +0,0 @@
INCSDIR= /usr/include/arm
INCS= compat_jmp_buf.h
NOOBJ= # defined
.include <bsd.prog.mk>

16
minix/lib/libcompat_minix/include/earm/compat_jmp_buf.h
View File

@ -1,16 +0,0 @@
#ifndef _COMPAT_MACHINE_JMP_BUF_H
#define _COMPAT_MACHINE_JMP_BUF_H
/* This file is strictly dependant on the libc's
* setjmp/longjmp code! Keep it in sync! */
/* This is used only by libddekit's src/thread.c.
* Being incredibly fragile (not to mention hardly
* portable, it would be a good idea to replace
* that code. */
#define JB_PC 148
#define JB_SP 144
#define JB_BP 136
#endif /* _COMPAT_MACHINE_JMP_BUF_H */

8
minix/lib/libcompat_minix/include/i386/Makefile
View File

@ -1,8 +0,0 @@
INCSDIR= /usr/include/${MACHINE_ARCH}
INCS= compat_jmp_buf.h
NOOBJ= # defined
.include <bsd.prog.mk>

16
minix/lib/libcompat_minix/include/i386/compat_jmp_buf.h
View File

@ -1,16 +0,0 @@
#ifndef _COMPAT_MACHINE_JMP_BUF_H
#define _COMPAT_MACHINE_JMP_BUF_H
/* This file is strictly dependant on the libc's
* setjmp/longjmp code! Keep it in sync! */
/* This is used only by libddekit's src/thread.c.
* Being incredibly fragile (not to mention hardly
* portable, it would be a good idea to replace
* that code. */
#define JB_PC 0
#define JB_SP 8
#define JB_BP 12
#endif /* _COMPAT_MACHINE_JMP_BUF_H */

4
minix/lib/libcompat_minix/include/net/Makefile
View File

@ -1,4 +0,0 @@
SUBDIR+= gen
.include <bsd.subdir.mk>

8
minix/lib/libcompat_minix/include/net/gen/Makefile
View File

@ -1,8 +0,0 @@
INCSDIR= /usr/include/net/gen
INCS= netdb.h resolv.h nameser.h
NOOBJ= # defined
.include <bsd.prog.mk>

5
minix/lib/libcompat_minix/include/net/gen/nameser.h
View File

@ -1,5 +0,0 @@
/*
* Minix compatibility.
*/
#include <arpa/nameser.h>

5
minix/lib/libcompat_minix/include/net/gen/netdb.h
View File

@ -1,5 +0,0 @@
/*
* Minix compatibility.
*/
#include <netdb.h>

5
minix/lib/libcompat_minix/include/net/gen/resolv.h
View File

@ -1,5 +0,0 @@
/*
* Minix compatibility.
*/
#include <resolv.h>

8
minix/lib/libcompat_minix/include/sys/Makefile
View File

@ -1,8 +0,0 @@
INCSDIR= /usr/include/sys
INCS= jmp_buf.h
NOOBJ= # defined
.include <bsd.prog.mk>

2
minix/lib/libcompat_minix/include/sys/jmp_buf.h
View File

@ -1,2 +0,0 @@
/* Stub for libddekit. Hopefully this will go away soon. */
#include <machine/compat_jmp_buf.h>

2
minix/lib/libminlib/servxcheck.c
View File

@ -23,7 +23,7 @@
#include <net/gen/tcp_io.h>
#include <net/gen/inet.h>
#include <net/gen/socket.h>
#include <net/gen/netdb.h>
#include <netdb.h>
/* Default service access file. */
static const char *path_servacces = _PATH_SERVACCES;