Added macros for Windows vs linux