Changes in uspace/lib/c/generic/thread/tls.c [ffccdff0:6340b4d2] in mainline

File:

• uspace/lib/c/generic/thread/tls.c (modified) (4 diffs)

uspace/lib/c/generic/thread/tls.c

@@ -37 +37 @@
 
 #include <assert.h>
-#include <stdalign.h>
 #include <stddef.h>
 #include <align.h>
@@ -70 +69 @@
 #else
         size_t tls_size = tls ? tls->p_memsz : 0;
-        return -ALIGN_UP((ptrdiff_t) tls_size, max(tls_align, alignof(tcb_t)));
+        return -ALIGN_UP((ptrdiff_t) tls_size, max(tls_align, _Alignof(tcb_t)));
 #endif
 }
@@ -105 +104 @@
 #else
         size_t alloc_size =
-            ALIGN_UP(tls_size, max(tls_align, alignof(tcb_t))) + sizeof(tcb_t);
-#endif
-
-        void *area = alloc(max(tls_align, alignof(tcb_t)), alloc_size);
+            ALIGN_UP(tls_size, max(tls_align, _Alignof(tcb_t))) + sizeof(tcb_t);
+#endif
+
+        void *area = alloc(max(tls_align, _Alignof(tcb_t)), alloc_size);
         if (!area)
                 return NULL;
@@ -188 +187 @@
         tls_free_arch(tcb,
             ALIGN_UP(tls->p_memsz, tls->p_align) + sizeof(tcb_t),
-            max(tls->p_align, alignof(tcb_t)));
+            max(tls->p_align, _Alignof(tcb_t)));
 }