diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-26 20:19:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-26 20:19:23 +0100 |
| commit | 5f455179ae4b279a82d99a7a3dabe61f58c42ad6 (patch) | |
| tree | fdecec022cf1b8b782b90a64c14e374fa6d400cb /xorg-server/hw/xfree86/parser/Extensions.c | |
| parent | 78d84bd03c744b0ed420c450dd2807904ccaef21 (diff) | |
| parent | 30af30b78075159fce477ae99cc72540133714d0 (diff) | |
| download | vcxsrv-5f455179ae4b279a82d99a7a3dabe61f58c42ad6.tar.gz vcxsrv-5f455179ae4b279a82d99a7a3dabe61f58c42ad6.tar.bz2 vcxsrv-5f455179ae4b279a82d99a7a3dabe61f58c42ad6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver randrproto libxtrans fontconfig libxcb xcb-proto mesa git update 26 Jan 2014
Conflicts:
X11/xtrans/Xtrans.c
xorg-server/dix/dispatch.c
xorg-server/os/xdmcp.c
Diffstat (limited to 'xorg-server/hw/xfree86/parser/Extensions.c')
| -rw-r--r-- | xorg-server/hw/xfree86/parser/Extensions.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/parser/Extensions.c b/xorg-server/hw/xfree86/parser/Extensions.c index ec0bda4c0..b5ba72e5f 100644 --- a/xorg-server/hw/xfree86/parser/Extensions.c +++ b/xorg-server/hw/xfree86/parser/Extensions.c @@ -39,7 +39,6 @@ #include "xf86tokens.h" #include "Configint.h" -extern LexRec val; static xf86ConfigSymTabRec ExtensionsTab[] = { {ENDSECTION, "endsection"}, @@ -66,7 +65,7 @@ xf86parseExtensionsSection(void) break; case COMMENT: ptr->extensions_comment = - xf86addComment(ptr->extensions_comment, val.str); + xf86addComment(ptr->extensions_comment, xf86_lex_val.str); break; default: Error(INVALID_KEYWORD_MSG, xf86tokenString()); |