Fixed some bugs introduced with function-style #define support.
There is still a rather serious bug in which directives on the line under a #define may or may not be interpreted.
Authored by: plombo 2011-02-02
Parent: [r2988]
Child: [r2990]
