Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.

1 files changed, 3 insertions, 2 deletions

diff --git a/usr.sbin/httpd/src/regex/mkh b/usr.sbin/httpd/src/regex/mkh
index 252b246c7bd..ee56cd15807 100644
--- a/usr.sbin/httpd/src/regex/mkh
+++ b/usr.sbin/httpd/src/regex/mkh
@@ -1,6 +1,5 @@
 #! /bin/sh
 # mkh - pull headers out of C source
-PATH=/bin:/usr/bin ; export PATH
 
 # egrep pattern to pick out marked lines
 egrep='^ =([ 	]|$)'
@@ -27,7 +26,7 @@ do
 		;;
 	-b)	# funny Berkeley __P macro
 		peel="$peel
-			"'/^\([^#\/][^\/]*[a-zA-Z0-9_)]\)(\(.*\))/s;;\1 __P((\2));'
+			"'/^\([^#\/][^\/]*[a-zA-Z0-9_)]\)(\(.*\))/s;;\1(\2);'
 		shift
 		;;
 	-s)	# compiler doesn't like `static foo();'
@@ -49,6 +48,8 @@ do
 	esac
 done
 
+echo "/* DON'T EVEN THINK ABOUT EDITING THIS, go see regex/Makefile,"
+echo " * search for mkh */"
 if test " $ifndef" != " "
 then
 	echo "#ifndef $ifndef"