about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-02-15 05:06:15 -0500
committerRich Felker <dalias@aerifal.cx>2011-02-15 05:06:15 -0500
commit13a026bd79f0024d57b7edf8305d625599d10810 (patch)
treebda85345568f69378fe3622af53f79be0612721e
parent03a2f3e48caec15b1a9cebccc85328e9b8169df0 (diff)
downloadmusl-13a026bd79f0024d57b7edf8305d625599d10810.tar.gz
musl-13a026bd79f0024d57b7edf8305d625599d10810.tar.xz
musl-13a026bd79f0024d57b7edf8305d625599d10810.zip
split off arch-specific stdarg.h stuff
-rw-r--r--arch/i386/bits/stdarg.h9
-rw-r--r--include/stdarg.h16
2 files changed, 10 insertions, 15 deletions
diff --git a/arch/i386/bits/stdarg.h b/arch/i386/bits/stdarg.h
new file mode 100644
index 00000000..6b1830d2
--- /dev/null
+++ b/arch/i386/bits/stdarg.h
@@ -0,0 +1,9 @@
+#define __VA_ALIGNED_SIZE(x) ((sizeof(x) + sizeof(int) - 1) & ~(sizeof(int) - 1))
+
+#define va_start(ap, last) ((ap) = (void *)(((char *)&(last)) + __VA_ALIGNED_SIZE(last)))
+#define va_end(ap) ((void)0)
+#define va_copy(dest, src) ((dest) = (src))
+
+#define va_arg(ap, type) \
+	( ((ap) = (va_list)((char *)(ap) + __VA_ALIGNED_SIZE(type))), \
+	*(type *)(void *)((char *)(ap) - __VA_ALIGNED_SIZE(type)) )
diff --git a/include/stdarg.h b/include/stdarg.h
index cb18778b..2e18e5f5 100644
--- a/include/stdarg.h
+++ b/include/stdarg.h
@@ -9,21 +9,7 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-#define __VA_ALIGNED_SIZE(x) ((sizeof(x) + sizeof(int) - 1) & ~(sizeof(int) - 1))
-
-#define va_start(ap, last) ((ap) = (void *)(((char *)&(last)) + __VA_ALIGNED_SIZE(last)))
-#define va_end(ap) ((void)0)
-#define va_copy(dest, src) ((dest) = (src))
-
-#if 0
-#define va_arg(ap, type) \
-	( ((ap) = (va_list)((char *)(ap) + sizeof(type))), \
-	*(type *)(void *)((char *)(ap) - sizeof(type)) )
-#endif
-
-#define va_arg(ap, type) \
-	( ((ap) = (va_list)((char *)(ap) + __VA_ALIGNED_SIZE(type))), \
-	*(type *)(void *)((char *)(ap) - __VA_ALIGNED_SIZE(type)) )
+#include <bits/stdarg.h>
 
 #ifdef __cplusplus
 }