Changeset 23a08aa0 for tests/concurrent/clib_tls.c

Timestamp:

Sep 19, 2022, 8:11:02 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

aa9f215

Parents:

ebf8ca5 (diff), ae1d151 (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/clib_tls.c (modified) (1 diff)

tests/concurrent/clib_tls.c

@@ -14 +14 @@
 
 
-thread_local int checkval = 0xBAADF00D;
+__thread int checkval = 0xBAADF00D;
 
 void init(void * ) {