aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/base/coro/rules.mk6
-rw-r--r--src/base/flate/internal.h2
-rw-r--r--src/base/gz/internal.h3
-rw-r--r--src/libfmt/do.c10
-rw-r--r--src/libutf/vendor/mkrunetype.c2
5 files changed, 11 insertions, 12 deletions
diff --git a/src/base/coro/rules.mk b/src/base/coro/rules.mk
index c2ee89f..d23bfd0 100644
--- a/src/base/coro/rules.mk
+++ b/src/base/coro/rules.mk
@@ -1,3 +1,3 @@
-SRCS_$(d)+=\
- $(d)/coro/coro.c\
- $(d)/coro/unix_x64.s\
+# SRCS_$(d)+=\
+# $(d)/coro/coro.c\
+# $(d)/coro/unix_x64.s\
diff --git a/src/base/flate/internal.h b/src/base/flate/internal.h
index 794c7c2..a926ed7 100644
--- a/src/base/flate/internal.h
+++ b/src/base/flate/internal.h
@@ -3,7 +3,7 @@
#include <u.h>
#include <base.h>
-#include <zlib.h>
+#include <vendor/zlib.h>
typedef struct buffer
{
diff --git a/src/base/gz/internal.h b/src/base/gz/internal.h
index 6a268c4..0e71db0 100644
--- a/src/base/gz/internal.h
+++ b/src/base/gz/internal.h
@@ -2,5 +2,4 @@
#include <u.h>
#include <base.h>
-
-#include <zlib.h>
+#include <vendor/zlib.h>
diff --git a/src/libfmt/do.c b/src/libfmt/do.c
index eaac0a3..bd2e65c 100644
--- a/src/libfmt/do.c
+++ b/src/libfmt/do.c
@@ -1,10 +1,8 @@
#include "internal.h"
-#include <stdatomic.h>
+#include <arch/atomic.h>
-#define atomic _Atomic
#define MaxFmt 128
-#define atomic·load atomic_load
-#define atomic·store atomic_store
+#define atomic·load(p) (*(p))
// -----------------------------------------------------------------------
// globals
@@ -25,11 +23,11 @@ static int badfmt(fmt·State *);
static struct
{
- atomic int len;
+ volatile int len;
Verb verb[MaxFmt];
} formatter =
{
- ATOMIC_VAR_INIT(30),
+ 30,
{
{' ', fmtflag},
{'#', fmtflag},
diff --git a/src/libutf/vendor/mkrunetype.c b/src/libutf/vendor/mkrunetype.c
index 9f939f4..b33df32 100644
--- a/src/libutf/vendor/mkrunetype.c
+++ b/src/libutf/vendor/mkrunetype.c
@@ -385,4 +385,6 @@ main(int argc, char *argv[])
mkto("upper", table.toupper, 1, 0);
mkto("lower", table.tolower, 1, 0);
mkto("title", table.totitle, 1, 0);
+
+ return 0;
}