Merge branch 'master' of git.labs.intellij.net:idea/community

diff --git a/native/fsNotifier/linux/inotify.c b/native/fsNotifier/linux/inotify.c
index 5198ed3ad53469e4b91d0b37f6dbd3b81026916e..dee299cdab7a85b96358690b0b2293b5c767b810 100644 (file)
--- a/native/fsNotifier/linux/inotify.c
+++ b/native/fsNotifier/linux/inotify.c
@@ -27,10 +27,10 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#ifdef __amd64__
-__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
-#else
+#if defined __i386__
 __asm__(".symver memcpy,memcpy@GLIBC_2.0");
+#elif defined __amd64__
+__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
 #endif