summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Gerecke <killertofu@gmail.com>2013-12-09 13:02:01 -0800
committerJason Gerecke <killertofu@gmail.com>2013-12-09 13:02:01 -0800
commit81123216f8eba2c90f8f0fb65a4d2003a7853503 (patch)
tree7d79f90d0331697a3fa7879ef9fe09e8f8defe3b
parent5395d18c4bbaa0d9ea96617ad41bd94848fb05e9 (diff)
downloadxf86-input-wacom-hack/fix_ubuntu_1204.tar.gz
HACK: Define 'input_option_new' for Ubuntu 12.04 'frankenserver'hack/fix_ubuntu_1204
The 'frankenserver' X server that ships with Ubuntu 12.04 doesn't actually implement the input_option_new function, despite what its version number would imply. With the symbol missing, the server crashes once a tablet is plugged in. This hack forces the input_option_new function to be compiled, allowing it to be resolved on the frakenserver. This patch DOES NOT belong in the upstream xf86-input-wacom tree.
-rw-r--r--src/wcmValidateDevice.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
index 1a5e722..11b5c35 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -341,7 +341,6 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
return ret;
}
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14
static InputOption*
input_option_new(InputOption *list, char *key, char *value)
{
@@ -367,7 +366,6 @@ input_option_free_list(InputOption **opts)
*opts = tmp;
}
}
-#endif
/**
* Duplicate xf86 options, replace the "type" option with the given type