Merge r185791 from head to stable/7:
Move macros defining flags and shortcuts to nested structure fields in inpcbinfo below the structure definition in order to make inpcbinfo fit on a single printed page; related style tweaks.
Approved by: re (kib)