Changeset ae267366 for tests/io

Timestamp:

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

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, stuck-waitfor-destruct

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

Location:

tests/io

Files:

• comp_basic.cfa (modified) (1 diff)
• comp_fair.cfa (modified) (1 diff)

tests/io/comp_basic.cfa

@@ -26 +26 @@
 #include <unistd.h>
 
-struct {
+static struct {
         barrier & bar;
         int pipe[2];
-
 } globals;
 

tests/io/comp_fair.cfa

@@ -26 +26 @@
 #include <unistd.h>
 
-struct {
+static struct {
         barrier & bar;
         int pipe[2];