[ros-diffs] [tkreuzer] 37507: Fix definitions of PFN_COUNT and (S)PFN_NUMBER