Fix up align issues

9 files changed, 6 insertions, 15 deletions

diff --git a/builtins/array.c b/builtins/array.c
index bf1b9309..a615a806 100644
--- a/builtins/array.c
+++ b/builtins/array.c
@@ -3,7 +3,6 @@
 #include <err.h>
 #include <gc.h>
 #include <gc/cord.h>
-#include <stdalign.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/builtins/bool.c b/builtins/bool.c
index 4efb2681..fb807857 100644
--- a/builtins/bool.c
+++ b/builtins/bool.c
@@ -1,7 +1,6 @@
 
 #include <gc.h>
 #include <gc/cord.h>
-#include <stdalign.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -29,7 +28,7 @@ public CORD Bool__as_str(const bool *b, bool colorize, const TypeInfo *type)
 public Bool_namespace_t Bool_type = {
     .type={
         .size=sizeof(bool),
-        .align=alignof(bool),
+        .align=__alignof__(bool),
         .tag=CustomInfo,
         .CustomInfo={.as_str=(void*)Bool__as_str},
     },
diff --git a/builtins/integers.c b/builtins/integers.c
index 13dbe31c..3784a047 100644
--- a/builtins/integers.c
+++ b/builtins/integers.c
@@ -1,6 +1,5 @@
 #include <gc.h>
 #include <gc/cord.h>
-#include <stdalign.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -50,7 +49,7 @@
     public KindOfInt##_namespace_t KindOfInt##_type = { \
         .type={ \
             .size=sizeof(c_type), \
-            .align=alignof(c_type), \
+            .align=__alignof__(c_type), \
             .tag=CustomInfo, \
             .CustomInfo={.compare=(void*)KindOfInt##__compare, .as_str=(void*)KindOfInt##__as_str}, \
         }, \
diff --git a/builtins/memory.c b/builtins/memory.c
index 2973fb8a..14640d8a 100644
--- a/builtins/memory.c
+++ b/builtins/memory.c
@@ -1,7 +1,6 @@
 
 #include <gc.h>
 #include <gc/cord.h>
-#include <stdalign.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/builtins/nums.c b/builtins/nums.c
index 8e6d7017..ebd67fec 100644
--- a/builtins/nums.c
+++ b/builtins/nums.c
@@ -4,7 +4,6 @@
 #include <gc.h>
 #include <gc/cord.h>
 #include <math.h>
-#include <stdalign.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -54,7 +53,7 @@ public bool Num64__isnan(double n) { return isnan(n); }
 public Num64_namespace_t Num64_type = {
     .type=(TypeInfo){
         .size=sizeof(double),
-        .align=alignof(double),
+        .align=__alignof__(double),
         .tag=CustomInfo,
         .CustomInfo={
             .compare=(void*)Num64__compare,
@@ -124,7 +123,7 @@ public bool Num32__isnan(float n) { return isnan(n); }
 public Num32_namespace_t Num32_type = {
     .type=(TypeInfo){
         .size=sizeof(float),
-        .align=alignof(float),
+        .align=__alignof__(float),
         .tag=CustomInfo,
         .CustomInfo={
             .compare=(void*)Num32__compare,
diff --git a/builtins/pointer.c b/builtins/pointer.c
index bc358488..b661015d 100644
--- a/builtins/pointer.c
+++ b/builtins/pointer.c
@@ -1,7 +1,6 @@
 
 #include <gc.h>
 #include <gc/cord.h>
-#include <stdalign.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/builtins/string.c b/builtins/string.c
index 6f692b64..7e20b34d 100644
--- a/builtins/string.c
+++ b/builtins/string.c
@@ -4,7 +4,6 @@
 #include <gc.h>
 #include <gc/cord.h>
 #include <limits.h>
-#include <stdalign.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -258,7 +257,7 @@ public CORD Str__join(CORD glue, Str_Array_t pieces)
 public Str_namespace_t Str_type = {
     .type={
         .size=sizeof(CORD),
-        .align=alignof(CORD),
+        .align=__alignof__(CORD),
         .tag=CustomInfo,
         .CustomInfo={
             .as_str=(void*)Str__as_str,
diff --git a/builtins/table.h b/builtins/table.h
index 90ce7b08..48e81a9c 100644
--- a/builtins/table.h
+++ b/builtins/table.h
@@ -1,5 +1,4 @@
 #pragma once
-#include <stdalign.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
diff --git a/builtins/types.c b/builtins/types.c
index d8b90021..fc0963d2 100644
--- a/builtins/types.c
+++ b/builtins/types.c
@@ -2,7 +2,6 @@
 #include <err.h>
 #include <gc.h>
 #include <string.h>
-#include <stdalign.h>
 #include <stdlib.h>
 #include <sys/param.h>
 
@@ -29,7 +28,7 @@ public struct {
 } TypeInfo_type = {
     .type={
         .size=sizeof(TypeInfo),
-        .align=alignof(TypeInfo),
+        .align=__alignof__(TypeInfo),
         .tag=CustomInfo,
         .TypeInfoInfo.type_str="TypeInfo",
     },