Repair the order of tokens.

[r18657]

diff --git a/tokens.inc b/tokens.inc
index 4c92797..95aae0d 100644 (file)
--- a/tokens.inc
+++ b/tokens.inc
@@ -66,13 +66,13 @@ S(_GNUC, __builtin_prefetch)
 S(_C99, __PRETTY_FUNCTION__)
 S(_ALL, __FUNCTION__)
 S(_C99, __func__)
-S(_C99, __alignof__)
 #undef S
 
 T(_GNUC,      real,           "__real__",)
 T(_GNUC,      _real,          "__real",                 = T_real)
 T(_GNUC,      imag,           "__imag__",)
 T(_GNUC,      _imag,          "__imag",                 = T_imag)
+T(_GNUC|_MS,  __alignof__,    "__alignof__",)
 T(_GNUC|_MS,  __alignof,      "__alignof",              = T___alignof__)
 T(_MS,        _alignof,       "_alignof",               = T___alignof__)
 T(_ANSI|_C99, const,          "const",)
@@ -82,6 +82,8 @@ T(_GNUC,      _restrict_,     "__restrict__",           = T_restrict)
 T(_C99,       _restrict,      "restrict",               = T_restrict)
 T(_ALL,       asm,            "asm",)
 T(_GNUC,      __asm__,        "__asm__",                = T_asm)
+T(_MS,        _asm,           "_asm",                   = T_asm)
+T(_MS,        __asm,          "__asm",                  = T_asm)
 T(_ANSI|_C99, volatile,       "volatile",)
 T(_GNUC,      __volatile__,   "__volatile__",           = T_volatile)
 T(_C99,       inline,         "inline",)
@@ -100,8 +102,6 @@ T(_MS,       near,            "_near",)
 T(_MS,       _near,           "__near",                  = T_near)
 T(_MS,       far,             "_far",)
 T(_MS,       _far,            "__far",                   = T_far)
-T(_MS,      _asm,             "_asm",                    = T_asm)
-T(_MS,      __asm,            "__asm",                   = T_asm)
 T(_MS,      cdecl,            "cdecl",)
 T(_MS,      _cdecl,           "_cdecl",                  = T_cdecl)
 T(_MS,      __cdecl,          "__cdecl",                 = T_cdecl)