frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jon TURNEY 2010-02-02 20:53:44 +00:00
parent b7dbbd3cd4
commit c76248fda9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xwin/winprefslex.l
View File

@ -88,7 +88,7 @@ ATSTART { return ATSTART; }
ATEND { return ATEND; } ATEND { return ATEND; }
EXEC { return EXEC; } EXEC { return EXEC; }
ALWAYSONTOP { return ALWAYSONTOP; } ALWAYSONTOP { return ALWAYSONTOP; }
DEBUG { return DEBUG; } DEBUG { return DEBUGOUTPUT; }
RELOAD { return RELOAD; } RELOAD { return RELOAD; }
TRAYICON { return TRAYICON; } TRAYICON { return TRAYICON; }
SILENTEXIT { return SILENTEXIT; } SILENTEXIT { return SILENTEXIT; }

4
hw/xwin/winprefsyacc.y
View File

@ -115,7 +115,7 @@ extern int yylex(void);
%token ATEND %token ATEND
%token EXEC %token EXEC
%token ALWAYSONTOP %token ALWAYSONTOP
%token DEBUG %token DEBUGOUTPUT "DEBUG"
%token RELOAD %token RELOAD
%token TRAYICON %token TRAYICON
%token FORCEEXIT %token FORCEEXIT
@ -243,7 +243,7 @@ forceexit: FORCEEXIT NEWLINE { pref.fForceExit = TRUE; }
silentexit: SILENTEXIT NEWLINE { pref.fSilentExit = TRUE; } silentexit: SILENTEXIT NEWLINE { pref.fSilentExit = TRUE; }
; ;
debug: DEBUG STRING NEWLINE { ErrorF("LoadPreferences: %s\n", $2); free($2); } debug: DEBUGOUTPUT STRING NEWLINE { ErrorF("LoadPreferences: %s\n", $2); free($2); }
; ;