rename all per-header internal structs to __<header>_h

10 files changed, 56 insertions, 56 deletions

diff --git a/mk/__fenv.d b/mk/__fenv.d
deleted file mode 100644
index 00fd56f5..00000000
--- a/mk/__fenv.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_C.-1: libc.a(__fenv.o)
-libc.a(__fenv.o): $(OBJDIR)/__fenv.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/__fenv.o: src/fenv/__fenv.c
-$(OBJDIR)/__fenv.o: src/fenv/_fenv.h
-$(OBJDIR)/__fenv.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/fenv/__fenv.c
diff --git a/mk/__fenv_h.d b/mk/__fenv_h.d
new file mode 100644
index 00000000..749d3b9e
--- /dev/null
+++ b/mk/__fenv_h.d
@@ -0,0 +1,9 @@
+libc_C.-1: libc.a(__fenv_h.o)
+libc.a(__fenv_h.o): $(OBJDIR)/__fenv_h.o
+	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
+
+$(OBJDIR)/__fenv_h.o: src/fenv/__fenv_h.c
+$(OBJDIR)/__fenv_h.o: src/fenv/_fenv.h
+$(OBJDIR)/__fenv_h.o:
+	@mkdir -p $(@D)
+	$(CC) -c -o $@ $(CFLAGS) src/fenv/__fenv_h.c
diff --git a/mk/__stdio.d b/mk/__stdio.d
deleted file mode 100644
index c3b2d0b5..00000000
--- a/mk/__stdio.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_C.0: libc.a(__stdio.o)
-libc.a(__stdio.o): $(OBJDIR)/__stdio.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/__stdio.o: src/stdio/__stdio.c
-$(OBJDIR)/__stdio.o: src/stdio/_stdio.h
-$(OBJDIR)/__stdio.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdio/__stdio.c
diff --git a/mk/__stdio_h.d b/mk/__stdio_h.d
new file mode 100644
index 00000000..36cc4336
--- /dev/null
+++ b/mk/__stdio_h.d
@@ -0,0 +1,9 @@
+libc_C.0: libc.a(__stdio_h.o)
+libc.a(__stdio_h.o): $(OBJDIR)/__stdio_h.o
+	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
+
+$(OBJDIR)/__stdio_h.o: src/stdio/__stdio_h.c
+$(OBJDIR)/__stdio_h.o: src/stdio/_stdio.h
+$(OBJDIR)/__stdio_h.o:
+	@mkdir -p $(@D)
+	$(CC) -c -o $@ $(CFLAGS) src/stdio/__stdio_h.c
diff --git a/mk/__stdlib.d b/mk/__stdlib.d
deleted file mode 100644
index 8dfb2640..00000000
--- a/mk/__stdlib.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_C.0: libc.a(__stdlib.o)
-libc.a(__stdlib.o): $(OBJDIR)/__stdlib.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/__stdlib.o: src/stdlib/__stdlib.c
-$(OBJDIR)/__stdlib.o: src/stdlib/_stdlib.h
-$(OBJDIR)/__stdlib.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/__stdlib.c
diff --git a/mk/__stdlib_h.d b/mk/__stdlib_h.d
new file mode 100644
index 00000000..5ca8d477
--- /dev/null
+++ b/mk/__stdlib_h.d
@@ -0,0 +1,9 @@
+libc_C.0: libc.a(__stdlib_h.o)
+libc.a(__stdlib_h.o): $(OBJDIR)/__stdlib_h.o
+	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
+
+$(OBJDIR)/__stdlib_h.o: src/stdlib/__stdlib_h.c
+$(OBJDIR)/__stdlib_h.o: src/stdlib/_stdlib.h
+$(OBJDIR)/__stdlib_h.o:
+	@mkdir -p $(@D)
+	$(CC) -c -o $@ $(CFLAGS) src/stdlib/__stdlib_h.c
diff --git a/mk/__time.d b/mk/__time.d
deleted file mode 100644
index f4be0c7a..00000000
--- a/mk/__time.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_C.-1: libc.a(__time.o)
-libc.a(__time.o): $(OBJDIR)/__time.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/__time.o: src/time/__time.c
-$(OBJDIR)/__time.o: src/time/_time.h
-$(OBJDIR)/__time.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/time/__time.c
diff --git a/mk/__time_h.d b/mk/__time_h.d
new file mode 100644
index 00000000..7aad4841
--- /dev/null
+++ b/mk/__time_h.d
@@ -0,0 +1,9 @@
+libc_C.-1: libc.a(__time_h.o)
+libc.a(__time_h.o): $(OBJDIR)/__time_h.o
+	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
+
+$(OBJDIR)/__time_h.o: src/time/__time_h.c
+$(OBJDIR)/__time_h.o: src/time/_time.h
+$(OBJDIR)/__time_h.o:
+	@mkdir -p $(@D)
+	$(CC) -c -o $@ $(CFLAGS) src/time/__time_h.c
diff --git a/mk/all.mk b/mk/all.mk
index 82a3ac40..a717f8f1 100644
--- a/mk/all.mk
+++ b/mk/all.mk
@@ -52,13 +52,13 @@ include mk/fesetexceptflag.d
 include mk/fetestexcept.d
 include mk/fegetexceptflag.d
 include mk/fesetround.d
-include mk/__fenv.d
 include mk/feupdateenv.d
 include mk/feholdexcept.d
 include mk/fesetenv.d
 include mk/feclearexcept.d
 include mk/fegetround.d
 include mk/fegetenv.d
+include mk/__fenv_h.d
 include mk/__dangerous.d
 include mk/atomic_store.d
 include mk/atomic_compare_exchange_weak.d
@@ -211,9 +211,9 @@ include mk/clock.d
 include mk/gmtime_s.d
 include mk/strftime.d
 include mk/localtime.d
-include mk/__time.d
 include mk/localtime_s.d
 include mk/nanosleep.d
+include mk/__time_h.d
 include mk/mktime.d
 include mk/asctime.d
 include mk/__readonly.d
@@ -259,7 +259,6 @@ include mk/fscanf_s.d
 include mk/getchar_unlocked.d
 include mk/tmpnam.d
 include mk/fsetpos.d
-include mk/__stdio.d
 include mk/scanf.d
 include mk/gets_s.d
 include mk/gets.d
@@ -280,6 +279,7 @@ include mk/snprintf.d
 include mk/putchar_unlocked.d
 include mk/flockfile.d
 include mk/fprintf_s.d
+include mk/__stdio_h.d
 include mk/freopen_s.d
 include mk/sprintf.d
 include mk/fscanf.d
@@ -450,6 +450,7 @@ include mk/qsort.d
 include mk/strtold.d
 include mk/free.d
 include mk/strtoull.d
+include mk/__stdlib_h.d
 include mk/mblen.d
 include mk/abs.d
 include mk/lldiv.d
@@ -476,7 +477,6 @@ include mk/wctomb_s.d
 include mk/strtod.d
 include mk/bsearch_s.d
 include mk/realloc.d
-include mk/__stdlib.d
 include mk/calloc.d
 include mk/div.d
 include mk/__sys.x86-64.s.d
diff --git a/mk/deps.mk b/mk/deps.mk
index c7865c33..a7de1837 100644
--- a/mk/deps.mk
+++ b/mk/deps.mk
@@ -218,10 +218,6 @@ all: mk/fesetround.d
 mk/fesetround.d: src/fenv/fesetround.c
 	sh mk/deps.sh src/fenv/fesetround.c
 
-all: mk/__fenv.d
-mk/__fenv.d: src/fenv/__fenv.c
-	sh mk/deps.sh src/fenv/__fenv.c
-
 all: mk/feupdateenv.d
 mk/feupdateenv.d: src/fenv/feupdateenv.c
 	sh mk/deps.sh src/fenv/feupdateenv.c
@@ -246,6 +242,10 @@ all: mk/fegetenv.d
 mk/fegetenv.d: src/fenv/fegetenv.c
 	sh mk/deps.sh src/fenv/fegetenv.c
 
+all: mk/__fenv_h.d
+mk/__fenv_h.d: src/fenv/__fenv_h.c
+	sh mk/deps.sh src/fenv/__fenv_h.c
+
 all: mk/__dangerous.d
 mk/__dangerous.d: src/__dangerous.c
 	sh mk/deps.sh src/__dangerous.c
@@ -854,10 +854,6 @@ all: mk/localtime.d
 mk/localtime.d: src/time/localtime.c
 	sh mk/deps.sh src/time/localtime.c
 
-all: mk/__time.d
-mk/__time.d: src/time/__time.c
-	sh mk/deps.sh src/time/__time.c
-
 all: mk/localtime_s.d
 mk/localtime_s.d: src/time/localtime_s.c
 	sh mk/deps.sh src/time/localtime_s.c
@@ -866,6 +862,10 @@ all: mk/nanosleep.d
 mk/nanosleep.d: src/time/nanosleep.c
 	sh mk/deps.sh src/time/nanosleep.c
 
+all: mk/__time_h.d
+mk/__time_h.d: src/time/__time_h.c
+	sh mk/deps.sh src/time/__time_h.c
+
 all: mk/mktime.d
 mk/mktime.d: src/time/mktime.c
 	sh mk/deps.sh src/time/mktime.c
@@ -1046,10 +1046,6 @@ all: mk/fsetpos.d
 mk/fsetpos.d: src/stdio/fsetpos.c
 	sh mk/deps.sh src/stdio/fsetpos.c
 
-all: mk/__stdio.d
-mk/__stdio.d: src/stdio/__stdio.c
-	sh mk/deps.sh src/stdio/__stdio.c
-
 all: mk/scanf.d
 mk/scanf.d: src/stdio/scanf.c
 	sh mk/deps.sh src/stdio/scanf.c
@@ -1130,6 +1126,10 @@ all: mk/fprintf_s.d
 mk/fprintf_s.d: src/stdio/fprintf_s.c
 	sh mk/deps.sh src/stdio/fprintf_s.c
 
+all: mk/__stdio_h.d
+mk/__stdio_h.d: src/stdio/__stdio_h.c
+	sh mk/deps.sh src/stdio/__stdio_h.c
+
 all: mk/freopen_s.d
 mk/freopen_s.d: src/stdio/freopen_s.c
 	sh mk/deps.sh src/stdio/freopen_s.c
@@ -1810,6 +1810,10 @@ all: mk/strtoull.d
 mk/strtoull.d: src/stdlib/strtoull.c
 	sh mk/deps.sh src/stdlib/strtoull.c
 
+all: mk/__stdlib_h.d
+mk/__stdlib_h.d: src/stdlib/__stdlib_h.c
+	sh mk/deps.sh src/stdlib/__stdlib_h.c
+
 all: mk/mblen.d
 mk/mblen.d: src/stdlib/mblen.c
 	sh mk/deps.sh src/stdlib/mblen.c
@@ -1914,10 +1918,6 @@ all: mk/realloc.d
 mk/realloc.d: src/stdlib/realloc.c
 	sh mk/deps.sh src/stdlib/realloc.c
 
-all: mk/__stdlib.d
-mk/__stdlib.d: src/stdlib/__stdlib.c
-	sh mk/deps.sh src/stdlib/__stdlib.c
-
 all: mk/calloc.d
 mk/calloc.d: src/stdlib/calloc.c
 	sh mk/deps.sh src/stdlib/calloc.c