r20594: Match popt.h declaration.