use functions instead of macros, reformat/reindent

[cparser] / tokens.inc

diff --git a/tokens.inc b/tokens.inc
index fd7219b..d801de9 100644 (file)
--- a/tokens.inc
+++ b/tokens.inc
@@ -89,29 +89,17 @@ S(_ALL, __thread)
 S(_ALL, __extension__)
 S(_ALL, __builtin_classify_type)
 S(_ALL, __builtin_va_list)
-S(_ALL, __builtin_expect)
-S(_ALL, __builtin_offsetof)
 S(_ALL, __builtin_va_arg)
-S(_ALL, __builtin_va_end)
-S(_ALL, __builtin_alloca)
-S(_ALL, __builtin_inf)
-S(_ALL, __builtin_inff)
-S(_ALL, __builtin_infl)
-S(_ALL, __builtin_nan)
-S(_ALL, __builtin_nanf)
-S(_ALL, __builtin_nanl)
+S(_ALL, __builtin_va_copy)
+S(_ALL, __builtin_offsetof)
+S(_ALL, __builtin_constant_p)
+S(_ALL, __builtin_types_compatible_p)
 S(_ALL, __builtin_isgreater)
 S(_ALL, __builtin_isgreaterequal)
 S(_ALL, __builtin_isless)
 S(_ALL, __builtin_islessequal)
 S(_ALL, __builtin_islessgreater)
 S(_ALL, __builtin_isunordered)
-S(_ALL, __builtin_constant_p)
-S(_ALL, __builtin_prefetch)
-S(_ALL, __builtin_huge_val)
-S(_ALL, __builtin_return_address)
-S(_ALL, __builtin_frame_address)
-S(_ALL, __builtin_types_compatible_p)
 S(_ALL, __PRETTY_FUNCTION__)
 S(_ALL, __FUNCTION__)
 S(_ALL, __label__)
@@ -124,6 +112,9 @@ S(_MS, __FUNCDNAME__)
 #ifdef __w64
 #undef __w64
 #endif
+#ifdef __ptr32
+#undef __ptr32
+#endif
 #ifdef __ptr64
 #undef __ptr64
 #endif