Corrected following ABV remark - #define should be put outside %{ ... %} block in...

Corrected following ABV remark - #define should be put outside %{ ... %} block in .i file in order not to be put into generated C++ files.