Updates macros to include static variables on Win32

Code was not working on Windows because Linux #ifdef was comment code out. This fixes that.