Changeset 08f3ad3 for libcfa/src/concurrency/kernel.hfa

Timestamp:

Sep 21, 2020, 11:37:28 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7a80113

Parents:

31a6f38 (diff), ace2e92 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc into master

File:

• libcfa/src/concurrency/kernel.hfa (modified) (2 diffs)

libcfa/src/concurrency/kernel.hfa

@@ -23 +23 @@
 
 extern "C" {
-#include <bits/pthreadtypes.h>
+        #include <bits/pthreadtypes.h>
+        #include <linux/types.h>
 }
 
@@ -157 +158 @@
 
 struct io_cancellation {
-        uint32_t target;
+        __u64 target;
 };