summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.com>2014-02-12 08:53:12 +0100
committerEgbert Eich <eich@suse.com>2014-02-14 00:07:16 +0100
commit1c163bd2ef9689897fab728ede96b6baafc0d597 (patch)
tree7037b2f71dfbacb0eaa0fbbeccabec28f25dfdb6
parent2e125f4f2993220652b375c1f934516ed0b79c67 (diff)
Fix type mismatch in test suite
Add CONST which expands to either 'const' or nothing depending on ABI version. This eliminates a compiler error. Signed-off-by: Egbert Eich <eich@suse.com> Reviewed-by: Jason Gerecke <killertofu@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--test/fake-symbols.c2
-rw-r--r--test/fake-symbols.h2
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);