Addition of const in ABI 12 breaks build if running make check against an
earlier server.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
---
test/fake-symbols.c | 15 ++++++++++++---
test/fake-symbols.h | 15 ++++++++++++---
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/test/fake-symbols.c b/test/fake-symbols.c
index 1b89c57..2a44a75 100644
--- a/test/fake-symbols.c
+++ b/test/fake-symbols.c
@@ -219,7 +219,10 @@ xf86PostButtonEventP(DeviceIntPtr device,
int is_down,
int first_valuator,
int num_valuators,
- const int *valuators)
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+ const
+#endif
+ int *valuators)
{
return;
}
@@ -318,7 +321,10 @@ xf86PostMotionEventP(DeviceIntPtr device,
int is_absolute,
int first_valuator,
int num_valuators,
- const int *valuators)
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+ const
+#endif
+ int *valuators)
{
return;
}
@@ -372,7 +378,10 @@ xf86PostProximityEventP(DeviceIntPtr device,
int is_in,
int first_valuator,
int num_valuators,
- const int *valuators)
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+ const
+#endif
+ int *valuators)
{
return;
}
diff --git a/test/fake-symbols.h b/test/fake-symbols.h
index 5551a76..33c3c9a 100644
--- a/test/fake-symbols.h
+++ b/test/fake-symbols.h
@@ -71,7 +71,10 @@ xf86PostButtonEventP(DeviceIntPtr device,
int is_down,
int first_valuator,
int num_valuators,
- const int *valuators);
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+ const
+#endif
+ int *valuators);
extern Bool
InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc);
@@ -112,7 +115,10 @@ xf86PostMotionEventP(DeviceIntPtr device,
int is_absolute,
int first_valuator,
int num_valuators,
- const int *valuators);
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+ const
+#endif
+ int *valuators);
extern Bool
InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels,
@@ -135,6 +141,9 @@ xf86PostProximityEventP(DeviceIntPtr device,
int is_in,
int first_valuator,
int num_valuators,
- const int *valuators);
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+ const
+#endif
+ int *valuators);
extern Bool InitFocusClassDeviceStruct(DeviceIntPtr dev);
--
1.7.3.5
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
