X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=tokens.inc;h=39c5a6a2baca4da617b5e22535c84ceac879e7bb;hb=89077dae17619e65a2e25c5afbbc9ece2574416e;hp=bca37bb40fd6a3738323499cb6d248369400c7ca;hpb=02f47f268839c472e23095ac0025e5ccbb5ed70a;p=cparser

diff --git a/tokens.inc b/tokens.inc
index bca37bb..39c5a6a 100644
--- a/tokens.inc
+++ b/tokens.inc
@@ -2,13 +2,16 @@
 #define TS(x,str,val)
 #endif
 
-TS(IDENTIFIER,              "identifier", = 256)
-TS(INTEGER,                 "integer number",)
-TS(CHARACTER_CONSTANT,      "character constant",)
-TS(WIDE_CHARACTER_CONSTANT, "wide character constant",)
-TS(FLOATINGPOINT,           "floatingpoint number",)
-TS(STRING_LITERAL,          "string literal",)
-TS(WIDE_STRING_LITERAL,     "wide string literal",)
+TS(IDENTIFIER,                "identifier", = 256)
+TS(INTEGER,                   "integer number",)
+TS(INTEGER_OCTAL,             "octal integer number",)
+TS(INTEGER_HEXADECIMAL,       "hexadecimal integer number",)
+TS(FLOATINGPOINT,             "floatingpoint number",)
+TS(FLOATINGPOINT_HEXADECIMAL, "hexadecimal floatingpoint number",)
+TS(CHARACTER_CONSTANT,        "character constant",)
+TS(WIDE_CHARACTER_CONSTANT,   "wide character constant",)
+TS(STRING_LITERAL,            "string literal",)
+TS(WIDE_STRING_LITERAL,       "wide string literal",)
 
 #define ALTERNATE(name, val)          T(_CXX, name, #name,  val)
 #define PUNCTUATOR(name, string, val) T(_ALL, name, string, val)
@@ -89,26 +92,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, __PRETTY_FUNCTION__)
 S(_ALL, __FUNCTION__)
 S(_ALL, __label__)
@@ -121,10 +115,41 @@ S(_MS, __FUNCDNAME__)
 #ifdef __w64
 #undef __w64
 #endif
+#ifdef __ptr32
+#undef __ptr32
+#endif
 #ifdef __ptr64
 #undef __ptr64
 #endif
 
+/* needed on MinGW */
+#ifdef __MINGW32__
+#ifdef __int8
+#undef __int8
+#endif
+#ifdef __int16
+#undef __int16
+#endif
+#ifdef __int32
+#undef __int32
+#endif
+#ifdef __int64
+#undef __int64
+#endif
+#endif
+
+#if defined(__MINGW32__) || defined(__CYGWIN__)
+#ifdef __cdecl
+#undef __cdecl
+#endif
+#ifdef __stdcall
+#undef __stdcall
+#endif
+#ifdef __fastcall
+#undef __fastcall
+#endif
+#endif
+
 /* needed on darwin... */
 #ifdef __signed
 #undef __signed
@@ -228,3 +253,10 @@ S(_MS,             __int64,                = T__int64)
 S(_MS,              _int128,               )
 S(_MS,             __int128,               = T__int128)
 #undef S
+
+/* Redefine required macros for MinGW headers */
+#if defined(__MINGW32__) || defined(__CYGWIN__)
+#define __stdcall __attribute__((__stdcall__))
+#define __fastcall __attribute__((__fastcall__))
+#define __cdecl __attribute__((__cdecl__))
+#endif