diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-16 09:37:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-16 09:43:48 +0200 |
| commit | 00eae6f01bf11ec6a90dfc68e607b6a1a250a118 (patch) | |
| tree | b814d518076840b7433d02bc3b5957c1dd54de25 /xorg-server/hw/xfree86/parser | |
| parent | a50d2ee664302147942dd5ed6428f9bab9d4e76a (diff) | |
| parent | d6d3999ccb2cb72d55820770260172eccbbb68d7 (diff) | |
| download | vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.gz vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.bz2 vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/securitysrv.h
xorg-server/glx/glxext.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_size_get.c
xorg-server/hw/xwin/winclip.c
xorg-server/hw/xwin/winfont.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winglobals.h
xorg-server/hw/xwin/winmonitors.h
xorg-server/include/closestr.h
xorg-server/include/pixmapstr.h
xorg-server/include/servermd.h
xorg-server/include/site.h
xorg-server/include/windowstr.h
xorg-server/include/xkbstr.h
Diffstat (limited to 'xorg-server/hw/xfree86/parser')
| -rw-r--r-- | xorg-server/hw/xfree86/parser/xf86tokens.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/xorg-server/hw/xfree86/parser/xf86tokens.h b/xorg-server/hw/xfree86/parser/xf86tokens.h index a9856064e..f751b7b0e 100644 --- a/xorg-server/hw/xfree86/parser/xf86tokens.h +++ b/xorg-server/hw/xfree86/parser/xf86tokens.h @@ -52,7 +52,6 @@ * authorization from the copyright holder(s) and author(s). */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif @@ -70,13 +69,13 @@ typedef enum { /* errno-style tokens */ - OBSOLETE_TOKEN = -5, - EOF_TOKEN = -4, - LOCK_TOKEN = -3, - ERROR_TOKEN = -2, + OBSOLETE_TOKEN = -5, + EOF_TOKEN = -4, + LOCK_TOKEN = -3, + ERROR_TOKEN = -2, /* value type tokens */ - NUMBER = 1, + NUMBER = 1, STRING, /* Tokens that can appear in many sections */ @@ -148,7 +147,7 @@ typedef enum { DEFAULTDEPTH, DEFAULTBPP, DEFAULTFBBPP, - + /* VideoAdaptor tokens */ VIDEOADAPTOR, @@ -170,7 +169,7 @@ typedef enum { LOAD, LOAD_DRIVER, DISABLE, - + /* Device tokens */ DRIVER, CHIPSET, @@ -251,7 +250,7 @@ typedef enum { DEPTH, BPP, WEIGHT, - + /* Layout Tokens */ SCREEN, INACTIVE, @@ -289,4 +288,4 @@ typedef enum { MATCH_IS_TOUCHSCREEN } ParserTokens; -#endif /* _xf86_tokens_h */ +#endif /* _xf86_tokens_h */ |