Merge release-4.5-patches into HEAD

[alexxy/gromacs.git] / include / xdrf.h

diff --git a/include/xdrf.h b/include/xdrf.h
index 5b89fa9f812c57f424302fc2ce3537009c8ac387..c77e7dfe00c17257874ce0fdd622250f01a45a36 100644 (file)
--- a/include/xdrf.h
+++ b/include/xdrf.h
@@ -44,7 +44,8 @@
 #define int64_t long long
 #endif
 
-#if (defined WIN32 || defined _WIN32 || defined WIN64  || defined _WIN64 || defined __CYGWIN__ || defined __CYGWIN32__ || defined GMX_INTERNAL_XDR)
+#include "gmx_header_config.h"
+#if (defined GMX_NATIVE_WINDOWS || defined GMX_CYGWIN || defined GMX_INTERNAL_XDR)
 #include "gmx_system_xdr.h"
 #else
 #include <rpc/rpc.h>