From 2045e87b7cefc688ceedea1c61ecc1f4795cc584 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jtunney@gmail.com>
Date: Thu, 15 Aug 2024 18:33:35 -0700
Subject: [PATCH] Fix build issues

---
 ape/BUILD.mk                       | 20 ++++++++++----------
 libc/intrin/strace.h               |  2 +-
 test/tool/build/lib/asmdown_test.c |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ape/BUILD.mk b/ape/BUILD.mk
index 7265b222a..3e8ea3137 100644
--- a/ape/BUILD.mk
+++ b/ape/BUILD.mk
@@ -45,10 +45,10 @@ o/$(MODE)/ape: $(APE)
 
 o/$(MODE)/ape/aarch64.lds:			\
 	ape/aarch64.lds				\
-	libc/zip.internal.h			\
+	libc/zip.h				\
 	libc/thread/tls.h			\
 	libc/calls/struct/timespec.h		\
-	libc/macros.internal.h			\
+	libc/macros.h				\
 	libc/str/str.h
 
 APE_LOADER_LDFLAGS =				\
@@ -162,8 +162,8 @@ o/$(MODE)/ape/ape-no-modify-self.o:		\
 		libc/dce.h			\
 		libc/elf/def.h			\
 		libc/thread/tls.h		\
-		libc/macho.internal.h		\
-		libc/macros.internal.h		\
+		libc/macho.h			\
+		libc/macros.h			\
 		libc/nexgen32e/uart.internal.h	\
 		libc/calls/metalfile.internal.h	\
 		libc/nt/pedef.internal.h	\
@@ -188,8 +188,8 @@ o/$(MODE)/ape/ape-copy-self.o:			\
 		libc/dce.h			\
 		libc/elf/def.h			\
 		libc/thread/tls.h		\
-		libc/macho.internal.h		\
-		libc/macros.internal.h		\
+		libc/macho.h			\
+		libc/macros.h			\
 		libc/nexgen32e/uart.internal.h	\
 		libc/calls/metalfile.internal.h	\
 		libc/nt/pedef.internal.h	\
@@ -259,8 +259,8 @@ o/$(MODE)/ape/ape.o:				\
 		libc/thread/tls.h		\
 		ape/ape.internal.h		\
 		ape/macros.internal.h		\
-		libc/macho.internal.h		\
-		libc/macros.internal.h		\
+		libc/macho.h			\
+		libc/macros.h			\
 		libc/sysv/consts/prot.h		\
 		libc/nt/pedef.internal.h	\
 		libc/runtime/pc.internal.h	\
@@ -281,7 +281,7 @@ o/$(MODE)/ape/ape.lds:				\
 		libc/dce.h			\
 		libc/elf/def.h			\
 		libc/elf/pf2prot.internal.h	\
-		libc/macros.internal.h		\
+		libc/macros.h			\
 		libc/nt/pedef.internal.h	\
 		libc/str/str.h			\
-		libc/zip.internal.h
+		libc/zip.h
diff --git a/libc/intrin/strace.h b/libc/intrin/strace.h
index adda49caa..3c521857f 100644
--- a/libc/intrin/strace.h
+++ b/libc/intrin/strace.h
@@ -5,7 +5,7 @@
 #define SYSDEBUG 0
 #endif
 
-#define _NTTRACE    1 /* not configurable w/ flag yet */
+#define _NTTRACE    0 /* not configurable w/ flag yet */
 #define _POLLTRACE  0 /* not configurable w/ flag yet */
 #define _DATATRACE  1 /* not configurable w/ flag yet */
 #define _LOCKTRACE  0 /* not configurable w/ flag yet */
diff --git a/test/tool/build/lib/asmdown_test.c b/test/tool/build/lib/asmdown_test.c
index 0d3b2259f..3524c2599 100644
--- a/test/tool/build/lib/asmdown_test.c
+++ b/test/tool/build/lib/asmdown_test.c
@@ -23,7 +23,7 @@
 TEST(ParseAsmdown, test) {
   struct Asmdown *ad;
   const char *s = "\
-#include \"libc/macros.internal.h\"\n\
+#include \"libc/macros.h\"\n\
 .source	__FILE__\n\
 \n\
 /	Returns absolute value of double.\n\
@@ -87,7 +87,7 @@ tinymath_acos:\n\
 TEST(ParseAsmdown, testAlias) {
   struct Asmdown *ad;
   const char *s = "\
-#include \"libc/macros.internal.h\"\n\
+#include \"libc/macros.h\"\n\
 .source	__FILE__\n\
 \n\
 /	Returns arc cosine of 𝑥.\n\
@@ -137,7 +137,7 @@ tinymath_acos:\n\
 TEST(ParseAsmdown, testClangIsEvil) {
   struct Asmdown *ad;
   const char *s = "\
-#include \"libc/macros.internal.h\"\n\
+#include \"libc/macros.h\"\n\
 .source	__FILE__\n\
 \n\
 //	Returns arc cosine of 𝑥.\n\