Move network includes and lib.h into common/include subdir.

This patch moves further includes (the network part and lib.h) in common/.
It is the last part to get the netbsd libc to compile under minix. Further moves will be needed as we get the netbsd libc to compile minix itself.

Also, this patch add #ifndef's to termios.h, as it create problems with netbsd's namespace.h.

common/include/Makefile.inc

@@ -2,6 +2,8 @@
 
 .PATH: ${MINIXSRCDIR}/common/include
 
+INCS+= 	lib.h
+
 INCS+= 	minix/ansi.h minix/bitmap.h minix/callnr.h minix/com.h \
 	minix/compiler.h minix/config.h minix/const.h minix/debug.h \
 	minix/devio.h minix/ds.h minix/endpoint.h minix/gcov.h \
@@ -9,6 +11,15 @@ INCS+= 	minix/ansi.h minix/bitmap.h minix/callnr.h minix/com.h \
 	minix/limits.h minix/minlib.h minix/portio.h minix/priv.h \
 	minix/profile.h minix/rs.h minix/safecopies.h minix/sef.h \
 	minix/spin.h minix/sys_config.h minix/sysinfo.h minix/syslib.h \
-	minix/sysutil.h minix/timers.h minix/type.h minix/vm.h
-
+	minix/sysutil.h minix/timers.h minix/type.h minix/u64.h minix/vm.h
 
+INCS+=	net/gen/arp_io.h net/gen/dhcp.h net/gen/ether.h \
+	net/gen/eth_hdr.h net/gen/eth_io.h net/gen/icmp.h \
+	net/gen/icmp_hdr.h net/gen/if_ether.h net/gen/inet.h \
+	net/gen/in.h net/gen/ip_hdr.h net/gen/ip_io.h \
+	net/gen/nameser.h net/gen/netdb.h net/gen/oneCsum.h \
+	net/gen/psip_hdr.h net/gen/psip_io.h net/gen/resolv.h \
+	net/gen/rip.h net/gen/route.h net/gen/socket.h \
+	net/gen/tcp.h net/gen/tcp_hdr.h net/gen/tcp_io.h \
+	net/gen/udp.h net/gen/udp_hdr.h net/gen/udp_io.h \
+	net/gen/vjhc.h

common/include/termios.h

@@ -133,10 +133,18 @@ _PROTOTYPE( int tcgetattr, (int _filedes, struct termios *_termios_p)        );
 _PROTOTYPE( int tcsetattr, \
 	(int _filedes, int _opt_actions, const struct termios *_termios_p)   );
 
+#ifndef cfgetispeed
 #define cfgetispeed(termios_p)		((termios_p)->c_ispeed)
+#endif
+#ifndef cfgetospeed
 #define cfgetospeed(termios_p)		((termios_p)->c_ospeed)
+#endif
+#ifndef cfsetispeed
 #define cfsetispeed(termios_p, speed)	((termios_p)->c_ispeed = (speed), 0)
+#endif
+#ifndef cfsetospeed
 #define cfsetospeed(termios_p, speed)	((termios_p)->c_ospeed = (speed), 0)
+#endif
 
 #ifdef _MINIX
 /* Here are the local extensions to the POSIX standard for Minix. Posix

include/Makefile

@@ -3,7 +3,7 @@
 INCS=	alloca.h a.out.h ar.h assert.h configfile.h ctype.h \
 	curses.h dirent.h env.h err.h errno.h fcntl.h fenv.h \
 	float.h fnmatch.h fts.h getopt.h glob.h grp.h ifaddrs.h \
-	inttypes.h libgen.h lib.h libutil.h limits.h locale.h \
+	inttypes.h libgen.h libutil.h limits.h locale.h \
 	mathconst.h math.h midiparser.h netdb.h pwd.h regex.h \
 	regexp.h setjmp.h sgtty.h signal.h stdarg.h stddef.h \
 	stdint.h stdbool.h stdio.h stdlib.h string.h strings.h sysexits.h \
@@ -24,28 +24,18 @@ INCS+=	minix/a.out.h minix/cdrom.h minix/cpufeature.h \
 	minix/queryparam.h \
 	minix/sched.h minix/sound.h \
 	minix/tty.h minix/types.h \
-	minix/u64.h minix/vfsif.h minix/vtreefs.h \
+	minix/vfsif.h minix/vtreefs.h \
 	minix/compiler-ack.h minix/sha2.h minix/sha1.h minix/md5.h \
 	minix/audio_fw.h minix/hash.h minix/input.h 
 INCS+=	net/hton.h net/if.h net/ioctl.h net/netlib.h
-INCS+=	net/gen/arp_io.h net/gen/dhcp.h net/gen/ether.h \
-	net/gen/eth_hdr.h net/gen/eth_io.h net/gen/icmp.h \
-	net/gen/icmp_hdr.h net/gen/if_ether.h net/gen/inet.h \
-	net/gen/in.h net/gen/ip_hdr.h net/gen/ip_io.h \
-	net/gen/nameser.h net/gen/netdb.h net/gen/oneCsum.h \
-	net/gen/psip_hdr.h net/gen/psip_io.h net/gen/resolv.h \
-	net/gen/rip.h net/gen/route.h net/gen/socket.h \
-	net/gen/tcp.h net/gen/tcp_hdr.h net/gen/tcp_io.h \
-	net/gen/udp.h net/gen/udp_hdr.h net/gen/udp_io.h \
-	net/gen/vjhc.h
 INCS+=	netinet/if_ether.h netinet/in.h netinet/tcp.h
 
 .include <bsd.own.mk>
 
 INCSDIR=        /usr/include
 
-.include "../common/include/Makefile.inc"
-.include "../common/include/Makefile.termios.inc"
+.include "${MINIXSRCDIR}/common/include/Makefile.inc"
+.include "${MINIXSRCDIR}/common/include/Makefile.termios.inc"
 
 SUBDIR=		sys arch