X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=tokens.inc;h=d6d6483a187c3d0d282f7915db7168f4cf35c49f;hb=27f4ce3da8d78ff0e70afde834793e0ebd81a42a;hp=9c86492210ee0e53237a0cf10e8bffa81de60eee;hpb=8f16244781a004fefe9a14d55f0e2463dee04eaf;p=cparser

diff --git a/tokens.inc b/tokens.inc
index 9c86492..d6d6483 100644
--- a/tokens.inc
+++ b/tokens.inc
@@ -55,9 +55,12 @@ S(_ALL, __builtin_offsetof)
 S(_ALL, __builtin_va_arg)
 S(_ALL, __builtin_va_end)
 S(_ALL, __builtin_alloca)
-S(_ALL, __builtin_nanf)
+S(_ALL, __builtin_inf)
+S(_ALL, __builtin_inff)
+S(_ALL, __builtin_infl)
 S(_ALL, __builtin_nan)
-S(_ALL, __builtin_nand)
+S(_ALL, __builtin_nanf)
+S(_ALL, __builtin_nanl)
 S(_ALL, __builtin_isgreater)
 S(_ALL, __builtin_isgreaterequal)
 S(_ALL, __builtin_isless)
@@ -69,11 +72,34 @@ S(_ALL, __builtin_prefetch)
 S(_ALL, __builtin_huge_val)
 S(_ALL, __PRETTY_FUNCTION__)
 S(_ALL, __FUNCTION__)
+S(_ALL, __label__)
 S(_C99, __func__)
 S(_MS, __FUNCSIG__)
 S(_MS, __FUNCDNAME__)
 #undef S
 
+/* needed on Windows */
+#ifdef __w64
+#undef __w64
+#endif
+#ifdef __ptr64
+#undef __ptr64
+#endif
+
+/* needed on darwin... */
+#ifdef __signed
+#undef __signed
+#endif
+#ifdef __volatile
+#undef __volatile
+#endif
+#ifdef __const
+#undef __const
+#endif
+#ifdef __restrict
+#undef __restrict
+#endif
+
 #define S(mode, x, val) T(mode, x, #x, val)
 S(_ANSI|_C99,   signed,               )
 S(_ALL,       __signed,               = T_signed)