Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2195)

Unified Diff: sysdeps/nacl/futex_emulation.h

Issue 7785030: Replace #define syscalls cancel machinery. (Closed) Base URL: http://git.chromium.org/native_client/nacl-glibc.git@master
Patch Set: Another (hopefully working) fix for glibc-tests Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sysdeps/nacl/futex_emulation.h
diff --git a/sysdeps/nacl/futex_emulation.h b/sysdeps/nacl/futex_emulation.h
index 68eaf73473ba165eb39d59a3f0f9b778cdf0b538..cdab5f2a96cbb6f00e208a05c773f4cc5f0e17a0 100644
--- a/sysdeps/nacl/futex_emulation.h
+++ b/sysdeps/nacl/futex_emulation.h
@@ -15,6 +15,8 @@ struct thread_wait_list_node
bool desc_is_initialized;
};
+#include <irt_syscalls.h>
+
#define __FUTEX_BITSET_MATCH_ANY 0xFFFFFFFF
void __nacl_futex_init (void);
@@ -22,10 +24,11 @@ void __nacl_futex_fini (void);
int __nacl_futex_wait (volatile int *addr, int val, unsigned int bitset,
const struct timespec *timeout);
-int __nacl_futex_wake (volatile int *addr, int nwake, unsigned int bitset);
+int __nacl_futex_wake (volatile int *addr, int nwake, unsigned int bitset,
+ int *count);
int __nacl_futex_wake_op (volatile int *addr1, volatile int *addr2, int nwake1,
- int nwake2, int op);
+ int nwake2, int op, int *count);
int __nacl_futex_cmp_requeue (volatile int *addr1, volatile int *addr2, int nwake,
- int nrequeue, int val);
+ int nrequeue, int val, int *count);
#endif

Powered by Google App Engine
This is Rietveld 408576698