Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / thread_mpi / numa_malloc.c

diff --git a/src/gromacs/gmxlib/thread_mpi/numa_malloc.c b/src/gromacs/gmxlib/thread_mpi/numa_malloc.c
index bcfd8790147dadab0b265bef0f77cf20cd6a6f1b..f419b14381dec4c9af78fe0953914f3bda2c87e8 100644 (file)
--- a/src/gromacs/gmxlib/thread_mpi/numa_malloc.c
+++ b/src/gromacs/gmxlib/thread_mpi/numa_malloc.c
@@ -23,7 +23,7 @@
 #endif
 
 
-#if ! (defined(WIN32) || defined( _WIN32 ) || defined(WIN64) || defined( _WIN64 ) || defined (__CYGWIN__))
+#if !(defined(WIN32) || defined( _WIN32 ) || defined(WIN64) || defined( _WIN64 )) || defined (__CYGWIN__) || defined (__CYGWIN32__)
 
 
 /* We don't have specific NUMA aware allocators: */