--- libeio/eio.h	2011/07/05 18:59:28	1.34
+++ libeio/eio.h	2011/07/05 20:34:42	1.35
@@ -45,6 +45,7 @@
 #endif
 
 #include <stddef.h>
+#include <signal.h>
 #include <sys/types.h>
 
 typedef struct eio_req    eio_req;
@@ -195,6 +196,12 @@
   long int3;       /* chown, fchown: gid */
   int errorno;     /* errno value on syscall return */
 
+#if __i386 || __amd64
+  unsigned char cancelled;
+#else
+  sig_atomic_t cancelled;
+#endif
+
   unsigned char flags; /* private */
   signed char pri;     /* the priority */
 
@@ -210,10 +217,9 @@
 
 /* _private_ request flags */
 enum {
-  EIO_FLAG_CANCELLED = 0x01, /* request was cancelled */
-  EIO_FLAG_PTR1_FREE = 0x02, /* need to free(ptr1) */
-  EIO_FLAG_PTR2_FREE = 0x04, /* need to free(ptr2) */
-  EIO_FLAG_GROUPADD  = 0x08  /* some request was added to the group */
+  EIO_FLAG_PTR1_FREE = 0x01, /* need to free(ptr1) */
+  EIO_FLAG_PTR2_FREE = 0x02, /* need to free(ptr2) */
+  EIO_FLAG_GROUPADD  = 0x04  /* some request was added to the group */
 };
 
 /* undocumented/unsupported/private helper */
@@ -308,7 +314,7 @@
 /* request api */
 
 /* true if the request was cancelled, useful in the invoke callback */
-#define EIO_CANCELLED(req)   ((req)->flags & EIO_FLAG_CANCELLED)
+#define EIO_CANCELLED(req)   ((req)->cancelled)
 
 #define EIO_RESULT(req)      ((req)->result)
 /* returns a pointer to the result buffer allocated by eio */