[src/trunk]: src/sys/rump/include/rump ok, rump_sockaddr_in was a pretty desp...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9e3d774893c9
branches:  trunk
changeset: 782812:9e3d774893c9
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Nov 21 17:35:21 2012 +0000

description:
ok, rump_sockaddr_in was a pretty desperate kludge in the first place,
much better solved by syscall compat.  but, now it's really time to let
it go since solaris thinks it's nice to define s_addr around any way
it likes.

diffstat:

 sys/rump/include/rump/makerumpdefs.sh |  23 +----------------------
 1 files changed, 1 insertions(+), 22 deletions(-)

diffs (43 lines):

diff -r d2e3d22d2b9f -r 9e3d774893c9 sys/rump/include/rump/makerumpdefs.sh
--- a/sys/rump/include/rump/makerumpdefs.sh     Wed Nov 21 17:18:11 2012 +0000
+++ b/sys/rump/include/rump/makerumpdefs.sh     Wed Nov 21 17:35:21 2012 +0000
@@ -8,38 +8,17 @@
 rm -f rumpdefs.h
 exec > rumpdefs.h
 
-printf '/*     $NetBSD: makerumpdefs.sh,v 1.11 2012/11/18 21:19:52 pooka Exp $ */\n\n'
+printf '/*     $NetBSD: makerumpdefs.sh,v 1.12 2012/11/21 17:35:21 pooka Exp $ */\n\n'
 printf '/*\n *\tAUTOMATICALLY GENERATED.  DO NOT EDIT.\n */\n\n'
 printf '#ifndef _RUMP_RUMPDEFS_H_\n'
 printf '#define _RUMP_RUMPDEFS_H_\n\n'
 printf '#include <rump/rump_namei.h>\n'
-printf '#ifdef _KERNEL\n'
-printf '#include <sys/stdint.h>\n'
-printf '#else\n'
-printf '#include <stdint.h>\n'
-printf '#endif\n'
 
 fromvers () {
        echo
        sed -n '1{s/\$//gp;q;}' $1
 }
 
-# Odds of sockaddr_in changing are zero, so no acrobatics needed.  Alas,
-# dealing with in_addr_t for s_addr is very difficult, so have it as
-# an incompatible uint32_t for now.
-echo
-cat <<EOF
-struct rump_sockaddr_in {
-       uint8_t         sin_len;
-       uint8_t         sin_family;
-       uint16_t        sin_port;
-       struct {
-                       uint32_t s_addr;
-       } sin_addr;
-       int8_t          sin_zero[8];
-};
-EOF
-
 fromvers ../../../sys/fcntl.h
 sed -n '/#define       O_[A-Z]*        *0x/s/O_/RUMP_O_/gp' \
     < ../../../sys/fcntl.h