Update the macros so that the code can be compiled with Intel Fortran on Windows (both 32 and 64 bits)
Authored by: arjenmarkus 2018-02-06
Parent: [r372]
Child: [r374]
