Replace #define syscalls cancel machinery.

sysdeps/nacl/irt_syscalls.h

 #ifndef _IRT_SYSCALLS_H
 #define _IRT_SYSCALLS_H
 
 #include <sys/types.h>
 #include <stddef.h>
 #include <fcntl.h>
 #include <time.h>
 
 #include <nacl_stat.h>
 
@@ skipping 57 matching lines @@
 extern int (*__nacl_irt_cond_wait) (int cond_handle, int mutex_handle);
 extern int (*__nacl_irt_cond_timed_wait_abs) (int cond_handle, int mutex_handle,
                                               const struct timespec *abstime);
 
 extern int (*__nacl_irt_tls_init) (void *tdb);
 extern void *(*__nacl_irt_tls_get) (void);
 
 extern int (*__nacl_irt_open_resource) (const char* file, int *fd);
 
 #endif
+
+#if defined(_LIBC) || defined (__need_emulated_syscalls)
+#ifndef _IRT_EMULATED_SYSCALLS_H
+#define _IRT_EMULATED_SYSCALLS_H 1
+
+#include <linux/getcpu.h>
+#include <linux/posix_types.h>

[pasko-google - do not use, 2011/09/02 16:25:24]

minor: plz, group linear part of includes together, and visibly separate

[khim, 2011/09/02 16:36:09]

Done.

+#ifndef _LINUX_TYPES_H
+#define ustat __kernel_ustat
+#include <linux/sysctl.h>
+#undef ustat
+#ifdef _LIBC
+#include <misc/sys/ustat.h>
+#else
+#include <sys/ustat.h>
+#endif
+#endif
+#ifndef _LIBC
+#include <mqueue.h>
+#endif
+#include <sys/poll.h>
+#include <sched.h>
+#include <signal.h>
+#include <streams/stropts.h>
+#include <sys/epoll.h>
+#include <sys/ptrace.h>
+#include <sys/times.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <time.h>
+#include <utime.h>
+
+#ifdef _LIBC
+struct robust_list_head;
+#else
+struct robust_list_head
+{
+  void *list;
+  long int futex_offset;
+  void *list_op_pending;
+};
+#endif
+
+#endif
+#endif