use functions instead of macros, reformat/reindent

[cparser] / tokens.inc

diff --git a/tokens.inc b/tokens.inc
index d4741e4..d801de9 100644 (file)
--- a/tokens.inc
+++ b/tokens.inc
@@ -89,8 +89,9 @@ S(_ALL, __thread)
 S(_ALL, __extension__)
 S(_ALL, __builtin_classify_type)
 S(_ALL, __builtin_va_list)
-S(_ALL, __builtin_offsetof)
 S(_ALL, __builtin_va_arg)
+S(_ALL, __builtin_va_copy)
+S(_ALL, __builtin_offsetof)
 S(_ALL, __builtin_constant_p)
 S(_ALL, __builtin_types_compatible_p)
 S(_ALL, __builtin_isgreater)
@@ -111,6 +112,9 @@ S(_MS, __FUNCDNAME__)
 #ifdef __w64
 #undef __w64
 #endif
+#ifdef __ptr32
+#undef __ptr32
+#endif
 #ifdef __ptr64
 #undef __ptr64
 #endif