diff options
author | marha <marha@users.sourceforge.net> | 2010-09-11 09:26:35 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-09-11 09:26:35 +0000 |
commit | 35b29c19707341bbfa32f7f6136ce09e59cb332c (patch) | |
tree | a795242657a2b96a463a11774517472fa4c64953 /xorg-server/hw/xfree86/parser/Configint.h | |
parent | ba6498fea6d935aff0856f9851cb47d5657952fa (diff) | |
parent | e172c89783326e2378e4793ff31a0f44210c5534 (diff) | |
download | vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.tar.gz vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.tar.bz2 vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/parser/Configint.h')
-rw-r--r-- | xorg-server/hw/xfree86/parser/Configint.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/xorg-server/hw/xfree86/parser/Configint.h b/xorg-server/hw/xfree86/parser/Configint.h index 63e510d8f..670c24da5 100644 --- a/xorg-server/hw/xfree86/parser/Configint.h +++ b/xorg-server/hw/xfree86/parser/Configint.h @@ -98,9 +98,6 @@ LexRec, *LexPtr; #define parsePrologue(typeptr,typerec) typeptr ptr; \
if( (ptr=calloc(1,sizeof(typerec))) == NULL ) { return NULL; }
-#define parsePrologueVoid(typeptr,typerec) int token; typeptr ptr; \
-if( (ptr=calloc(1,sizeof(typerec))) == NULL ) { return; }
-
#define HANDLE_RETURN(f,func)\
if ((ptr->f=func) == NULL)\
{\
@@ -152,10 +149,6 @@ else\ "The %s keyword requires a boolean to follow it."
#define ZAXISMAPPING_MSG \
"The ZAxisMapping keyword requires 2 positive numbers or X or Y to follow it."
-#define AUTOREPEAT_MSG \
-"The AutoRepeat keyword requires 2 numbers (delay and rate) to follow it."
-#define XLEDS_MSG \
-"The XLeds keyword requries one or more numbers to follow it."
#define DACSPEED_MSG \
"The DacSpeed keyword must be followed by a list of up to %d numbers."
#define DISPLAYSIZE_MSG \
@@ -216,7 +209,5 @@ else\ /* Warning messages */
#define OBSOLETE_MSG \
"Ignoring obsolete keyword \"%s\"."
-#define MOVED_TO_FLAGS_MSG \
-"Keyword \"%s\" is now an Option flag in the ServerFlags section."
#endif /* _Configint_h_ */
|