2004/03/17 12:26:23 waratah 1.4.4.1: #i1858# alter the order of some definitions to fix some -Wall warnings