Disable some advanced (post glibc-2.3) libuv features when snapshotti…

…ng rust.
graydon · Mar 26, 2012 · 1d6aec9 · 1d6aec9
1 parent 1170ffb
commit 1d6aec9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/unix/eio/config_linux.h b/src/unix/eio/config_linux.h
@@ -23,7 +23,9 @@
 #define HAVE_MEMORY_H 1
 
 /* pread(2) and pwrite(2) are available */
+#if !defined(RUST_SNAPSHOT)
 #define HAVE_PREADWRITE 1
+#endif
 
 /* readahead(2) is available (linux) */
 #define HAVE_READAHEAD 1
@@ -44,7 +46,7 @@
 #define HAVE_STRING_H 1
 
 /* sync_file_range(2) is available if kernel >= 2.6.17 and glibc >= 2.6 */
-#if LINUX_VERSION_CODE >= 0x020611 && __GLIBC_PREREQ(2, 6)
+#if LINUX_VERSION_CODE >= 0x020611 && __GLIBC_PREREQ(2, 6) && !defined(RUST_SNAPSHOT)
 #define HAVE_SYNC_FILE_RANGE 1
 #else
 #define HAVE_SYNC_FILE_RANGE 0

diff --git a/src/unix/ev/config_linux.h b/src/unix/ev/config_linux.h
@@ -14,21 +14,21 @@
 #define HAVE_DLFCN_H 1
 
 /* epoll_ctl(2) is available if kernel >= 2.6.9 and glibc >= 2.4 */
-#if LINUX_VERSION_CODE >= 0x020609 && __GLIBC_PREREQ(2, 4)
+#if LINUX_VERSION_CODE >= 0x020609 && __GLIBC_PREREQ(2, 4) && !defined(RUST_SNAPSHOT)
 #define HAVE_EPOLL_CTL 1
 #else
 #define HAVE_EPOLL_CTL 0
 #endif
 
 /* eventfd(2) is available if kernel >= 2.6.22 and glibc >= 2.8 */
-#if LINUX_VERSION_CODE >= 0x020616 && __GLIBC_PREREQ(2, 8)
+#if LINUX_VERSION_CODE >= 0x020616 && __GLIBC_PREREQ(2, 8) && !defined(RUST_SNAPSHOT)
 #define HAVE_EVENTFD 1
 #else
 #define HAVE_EVENTFD 0
 #endif
 
 /* inotify_init(2) is available if kernel >= 2.6.13 and glibc >= 2.4 */
-#if LINUX_VERSION_CODE >= 0x02060d && __GLIBC_PREREQ(2, 4)
+#if LINUX_VERSION_CODE >= 0x02060d && __GLIBC_PREREQ(2, 4) && !defined(RUST_SNAPSHOT)
 #define HAVE_INOTIFY_INIT 1
 #else
 #define HAVE_INOTIFY_INIT 0
@@ -68,7 +68,7 @@
 #define HAVE_SELECT 1
 
 /* signalfd(2) is available if kernel >= 2.6.22 and glibc >= 2.8 */
-#if LINUX_VERSION_CODE >= 0x020616 && __GLIBC_PREREQ(2, 8)
+#if LINUX_VERSION_CODE >= 0x020616 && __GLIBC_PREREQ(2, 8) && !defined(RUST_SNAPSHOT)
 #define HAVE_SIGNALFD 1
 #else
 #define HAVE_SIGNALFD 0