Module Name: src
Committed By: jmcneill
Date: Sun Jan 8 18:05:03 UTC 2012
Modified Files:
src/sys/arch/usermode/include: genheaders.sh
Log Message:
disklabel.h: handle __HAVE_OLD_DISKLABEL. while here, I noticed someone changed
param.h without updating genheaders.h, so catch up.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/usermode/include/genheaders.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/usermode/include/genheaders.sh
diff -u src/sys/arch/usermode/include/genheaders.sh:1.2 src/sys/arch/usermode/include/genheaders.sh:1.3
--- src/sys/arch/usermode/include/genheaders.sh:1.2 Thu Sep 8 10:49:41 2011
+++ src/sys/arch/usermode/include/genheaders.sh Sun Jan 8 18:05:02 2012
@@ -45,15 +45,20 @@ EOF
# 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}
