Use new name for macro
CVS patchset: 10187 CVS date: 2006/08/14 16:31:38
Mercurial revision: 036c151f90baa54b57bb9ca02fa517a09ad36c22