1. Removed the stricmp guard 2. Added a #ifdef->#undef solution If this break compilation on linux or on gcc 4 on win32 (very low probability, if any), let's think further. svn path=/trunk/; revision=24076