diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-06-18 09:30:05 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-06-18 09:30:05 +0200 |
| commit | 8c6080d1f0e94fa81ac64bef9a88b0ae8945f739 (patch) | |
| tree | 3b088a1e4a62462cc0cd05daf7a2d1b8ca50dd5c /patches/xf86-input-tslib-0.0.6 | |
| parent | 6e48293f380f6c115bd433f8519e7f96e8f0f66f (diff) | |
| download | ptxdist-8c6080d1f0e94fa81ac64bef9a88b0ae8945f739.tar.gz ptxdist-8c6080d1f0e94fa81ac64bef9a88b0ae8945f739.tar.xz | |
xorg-driver-input-tslib: add patch to fix name collision
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/xf86-input-tslib-0.0.6')
| -rw-r--r-- | patches/xf86-input-tslib-0.0.6/0003-fix-name-collision-with-Xorg-macro.patch | 34 | ||||
| -rw-r--r-- | patches/xf86-input-tslib-0.0.6/series | 3 |
2 files changed, 36 insertions, 1 deletions
diff --git a/patches/xf86-input-tslib-0.0.6/0003-fix-name-collision-with-Xorg-macro.patch b/patches/xf86-input-tslib-0.0.6/0003-fix-name-collision-with-Xorg-macro.patch new file mode 100644 index 000000000..0795ac398 --- /dev/null +++ b/patches/xf86-input-tslib-0.0.6/0003-fix-name-collision-with-Xorg-macro.patch @@ -0,0 +1,34 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Mon, 18 Jun 2012 09:25:09 +0200 +Subject: [PATCH] fix name collision with Xorg macro + +If xorg-server is compiled with --enable-tslib (for kdrive) then +xorg-server.h contains '#define TSLIB 1'. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + src/tslib.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tslib.c b/src/tslib.c +index 0446148..4824fc4 100644 +--- a/src/tslib.c ++++ b/src/tslib.c +@@ -594,7 +594,7 @@ xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags) + #endif + } + +-_X_EXPORT InputDriverRec TSLIB = { ++_X_EXPORT InputDriverRec TSLIB_REC = { + 1, /* driver version */ + "tslib", /* driver name */ + NULL, /* identify */ +@@ -631,7 +631,7 @@ static pointer xf86TslibPlug(pointer module, pointer options, int *errmaj, int * + { + static Bool Initialised = FALSE; + +- xf86AddInputDriver(&TSLIB, module, 0); ++ xf86AddInputDriver(&TSLIB_REC, module, 0); + + return module; + } diff --git a/patches/xf86-input-tslib-0.0.6/series b/patches/xf86-input-tslib-0.0.6/series index 1cca5a760..18216ee47 100644 --- a/patches/xf86-input-tslib-0.0.6/series +++ b/patches/xf86-input-tslib-0.0.6/series @@ -2,4 +2,5 @@ #tag:base --start-number 1 0001-fix-segfault.patch 0002-add-support-for-ABI-12.patch -# 11df7c3371f5b4ed9d1d4047978ba553 - git-ptx-patches magic +0003-fix-name-collision-with-Xorg-macro.patch +# fd8f57a2d8b01331dcdfb70b7bf274a4 - git-ptx-patches magic |