Changeset ae267366 for tests/concurrent/signal/disjoint.cfa

Timestamp:

Feb 24, 2023, 3:31:50 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

2e77837

Parents:

f883ef1 (diff), f2a1cd2 (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:

fix merge conflict

File:

• tests/concurrent/signal/disjoint.cfa (modified) (1 diff)

tests/concurrent/signal/disjoint.cfa

@@ -38 +38 @@
 
 // Use a global struct because the order needs to match with Signaller thread
-struct {
+static struct {
         global_t mut;
         global_data_t data;