On Wed, Feb 12, 2014 at 08:00:23PM +0100, Egbert Eich wrote:
> From: Egbert Eich <e...@suse.com>
>
> Add CONST which expands to either 'const' or nothing depending
> on ABI version.
> This eliminates a compiler error.
>
> Signed-off-by: Egbert Eich <e...@suse.com>
Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
Cheers,
Peter
> ---
> test/fake-symbols.c | 2 +-
> test/fake-symbols.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/test/fake-symbols.c b/test/fake-symbols.c
> index 688b238..c5eac4a 100644
> --- a/test/fake-symbols.c
> +++ b/test/fake-symbols.c
> @@ -92,7 +92,7 @@ xf86NameCmp(const char *s1, const char *s2)
> }
>
> _X_EXPORT char *
> -xf86CheckStrOption(OPTTYPE optlist, const char *name, char *deflt)
> +xf86CheckStrOption(OPTTYPE optlist, const char *name, CONST char *deflt)
> {
> return NULL;
> }
> diff --git a/test/fake-symbols.h b/test/fake-symbols.h
> index cbce546..6ef5607 100644
> --- a/test/fake-symbols.h
> +++ b/test/fake-symbols.h
> @@ -22,7 +22,7 @@ extern void xf86OptionListFree(OPTTYPE optlist);
> extern char* xf86OptionName(OPTTYPE opt);
> extern CONST char* xf86FindOptionValue(OPTTYPE options, const char *name);
> extern int xf86NameCmp(const char *s1, const char *s2);
> -extern char* xf86CheckStrOption(OPTTYPE optlist, const char *name, char
> *deflt);
> +extern char* xf86CheckStrOption(OPTTYPE optlist, const char *name, CONST
> char *deflt);
> extern int xf86CheckBoolOption(OPTTYPE list, const char *name, int deflt);
>
>
> --
> 1.8.1.4
>
>
> ------------------------------------------------------------------------------
> Android apps run on BlackBerry 10
> Introducing the new BlackBerry 10.2.1 Runtime for Android apps.
> Now with support for Jelly Bean, Bluetooth, Mapview and more.
> Get your Android app in front of a whole new audience. Start now.
> http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk
> _______________________________________________
> Linuxwacom-devel mailing list
> Linuxwacom-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
>
------------------------------------------------------------------------------
Android apps run on BlackBerry 10
Introducing the new BlackBerry 10.2.1 Runtime for Android apps.
Now with support for Jelly Bean, Bluetooth, Mapview and more.
Get your Android app in front of a whole new audience. Start now.
http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
