Please try the attached patch.
I haven't tested it, except to verify that it compiles.
-- 
	--Per Bothner
per@bothner.com   http://per.bothner.com/