From c5d917c3600c21b8a563eadda1c18f1cb1b9a878 Mon Sep 17 00:00:00 2001
From: Romain Goyet <romain@goyet.com>
Date: Sun, 30 Jul 2017 15:30:46 +0200
Subject: [PATCH] [liba] Cleaner __builtin-based defines

Change-Id: I4b58ab36f25e9cb136c21375166921c04882dd21
---
 liba/include/stdarg.h | 9 +++++----
 liba/include/stddef.h | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/liba/include/stdarg.h b/liba/include/stdarg.h
index e534fe689..aa1236540 100644
--- a/liba/include/stdarg.h
+++ b/liba/include/stdarg.h
@@ -1,9 +1,10 @@
 #ifndef LIBA_STDARG_H
 #define LIBA_STDARG_H
 
-#define va_arg __builtin_va_arg
-#define va_end __builtin_va_end
-#define va_list __builtin_va_list
-#define va_start __builtin_va_start
+typedef __builtin_va_list va_list;
+
+#define va_start(ap,last) __builtin_va_start(ap,last)
+#define va_arg(ap,type) __builtin_va_arg(ap,type)
+#define va_end(ap) __builtin_va_end(ap)
 
 #endif
diff --git a/liba/include/stddef.h b/liba/include/stddef.h
index 4ed45eca6..b041477e7 100644
--- a/liba/include/stddef.h
+++ b/liba/include/stddef.h
@@ -6,6 +6,6 @@
 typedef int ssize_t;
 typedef unsigned int size_t;
 
-#define offsetof(st, m) __builtin_offsetof(st, m)
+#define offsetof(type, field) __builtin_offsetof(type, field)
 
 #endif