[src/trunk]: src/sys/arch/usermode/include disklabel.h: handle __HAVE_OLD_DIS...

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

details:   https://anonhg.NetBSD.org/src/rev/99af46c05fa9
branches:  trunk
changeset: 772561:99af46c05fa9
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Jan 08 18:05:02 2012 +0000

description:
disklabel.h: handle __HAVE_OLD_DISKLABEL. while here, I noticed someone changed param.h without updating genheaders.h, so catch up.

diffstat:

 sys/arch/usermode/include/genheaders.sh |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 3be1aee4b0d3 -r 99af46c05fa9 sys/arch/usermode/include/genheaders.sh
--- a/sys/arch/usermode/include/genheaders.sh   Sun Jan 08 14:53:54 2012 +0000
+++ b/sys/arch/usermode/include/genheaders.sh   Sun Jan 08 18:05:02 2012 +0000
@@ -45,15 +45,20 @@
 
        # header specific quirks
        if [ "$hdr" = "disklabel.h" ]; then
+               echo "#include <machine/types.h>" >> ${hdr}
+               echo "#ifndef __HAVE_OLD_DISKLABEL" >> ${hdr}
                echo "#undef DISKUNIT" >> ${hdr}
                echo "#undef DISKPART" >> ${hdr}
                echo "#undef DISKMINOR" >> ${hdr}
+               echo "#endif" >> ${hdr}
        elif [ "$hdr" = "ptrace.h" ]; then
                echo "#undef __HAVE_PTRACE_MACHDEP" >> ${hdr}
                echo "#undef __HAVE_PROCFS_MACHDEP" >> ${hdr}
        elif [ "$hdr" = "param.h" ]; then
+               echo "#undef UPAGES" >> ${hdr}
+               echo "#define UPAGES 6" >> ${hdr}
                echo "#undef USPACE" >> ${hdr}
-               echo "#define USPACE (PAGE_SIZE*4)" >> ${hdr}
+               echo "#define USPACE (PAGE_SIZE*UPAGES)" >> ${hdr}
        fi
 
        echo >>${hdr}