diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-27 08:37:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-27 08:37:52 +0200 |
| commit | 2a9be4af293f20fa33cc34fbc3b72e2235d91090 (patch) | |
| tree | d41608bda1d56be1aa96857dee20e988b53760a3 /xorg-server/hw/xfree86/common/xf86Option.c | |
| parent | 9d53da0fbb9ae6df9a38ad40df4f53cd28287235 (diff) | |
| parent | d662d461634660f5c0f3998b5eb7d7ed3bd5a25f (diff) | |
| download | vcxsrv-2a9be4af293f20fa33cc34fbc3b72e2235d91090.tar.gz vcxsrv-2a9be4af293f20fa33cc34fbc3b72e2235d91090.tar.bz2 vcxsrv-2a9be4af293f20fa33cc34fbc3b72e2235d91090.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Option.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Option.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Option.c b/xorg-server/hw/xfree86/common/xf86Option.c index 73b6573f1..9c528782f 100644 --- a/xorg-server/hw/xfree86/common/xf86Option.c +++ b/xorg-server/hw/xfree86/common/xf86Option.c @@ -44,6 +44,7 @@ #include "xf86Xinput.h" #include "xf86Optrec.h" #include "xf86Parser.h" +#include "optionstr.h" static Bool ParseOptionValue(int scrnIndex, XF86OptionPtr options, OptionInfoPtr p, Bool markUsed); @@ -298,7 +299,7 @@ xf86CheckPercentOption(XF86OptionPtr optlist, const char *name, double deflt) return LookupPercentOption(optlist, name, deflt, FALSE); } /* - * addNewOption() has the required property of replacing the option value + * xf86AddNewOption() has the required property of replacing the option value * if the option is already present. */ XF86OptionPtr |