diff options
author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-02-02 20:53:44 +0000 |
---|---|---|
committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-02-05 19:21:19 +0000 |
commit | c76248fda99c38aef0ccf0ed6b58fbe95f6fe497 (patch) | |
tree | b55c488e2830ee66bbf83d2795998c25c1d2fa21 /hw/xwin/winprefslex.l | |
parent | b7dbbd3cd4d28cd4939706b3bf6394ba8ecafaff (diff) |
Cygwin/X: Avoid a collision between DEBUG and a token name
Rename a token to avoid a collision between DEBUG defined via AC_DEFINE
if --enable-debug is configured, and the token for the 'debug' instruction
in the XWin preferences file
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Diffstat (limited to 'hw/xwin/winprefslex.l')
-rw-r--r-- | hw/xwin/winprefslex.l | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xwin/winprefslex.l b/hw/xwin/winprefslex.l index 9a384a2cd..463dff4ca 100644 --- a/hw/xwin/winprefslex.l +++ b/hw/xwin/winprefslex.l @@ -88,7 +88,7 @@ ATSTART { return ATSTART; } ATEND { return ATEND; } EXEC { return EXEC; } ALWAYSONTOP { return ALWAYSONTOP; } -DEBUG { return DEBUG; } +DEBUG { return DEBUGOUTPUT; } RELOAD { return RELOAD; } TRAYICON { return TRAYICON; } SILENTEXIT { return SILENTEXIT; } |