From: Gianluca Guida Date: Fri, 8 Apr 2011 18:50:58 +0000 (+0000) Subject: Move back resolv.h, nameser.h and netdb.h as they conflict with NetBSD headers and... X-Git-Tag: v3.2.0~582 X-Git-Url: http://zhaoyanbai.com/repos/rndc.html?a=commitdiff_plain;h=4e86b0d53fbaf05925d0ea939939d865e512df04;p=minix.git Move back resolv.h, nameser.h and netdb.h as they conflict with NetBSD headers and libc. --- diff --git a/common/include/Makefile.inc b/common/include/Makefile.inc index ece674780..15bfd7098 100644 --- a/common/include/Makefile.inc +++ b/common/include/Makefile.inc @@ -24,12 +24,11 @@ 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/oneCsum.h net/gen/psip_hdr.h net/gen/psip_io.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/udp_io_hdr.h \ - net/gen/vjhc.h + net/gen/udp.h net/gen/udp_hdr.h net/gen/udp_io.h \ + net/gen/udp_io_hdr.h net/gen/vjhc.h INCS+= ddekit/assert.h ddekit/initcall.h ddekit/memory.h ddekit/pgtab.h \ ddekit/thread.h ddekit/attribs.h ddekit/inline.h ddekit/printf.h \ diff --git a/include/Makefile b/include/Makefile index 7ff202c7e..8ded2bece 100644 --- a/include/Makefile +++ b/include/Makefile @@ -16,6 +16,7 @@ INCS+= minix/a.out.h minix/cdrom.h minix/compiler-ack.h minix/dirent.h \ minix/dl_eth.h minix/md5.h minix/sha1.h minix/sha2.h minix/types.h INCS+= net/hton.h net/if.h net/ioctl.h net/netlib.h +INCS+= net/gen/netdb.h net/gen/resolv.h net/gen/nameser.h INCS+= netinet/if_ether.h netinet/in.h netinet/tcp.h .include diff --git a/common/include/net/gen/nameser.h b/include/net/gen/nameser.h similarity index 100% rename from common/include/net/gen/nameser.h rename to include/net/gen/nameser.h diff --git a/common/include/net/gen/netdb.h b/include/net/gen/netdb.h similarity index 100% rename from common/include/net/gen/netdb.h rename to include/net/gen/netdb.h diff --git a/common/include/net/gen/resolv.h b/include/net/gen/resolv.h similarity index 100% rename from common/include/net/gen/resolv.h rename to include/net/gen/resolv.h