mirror of
https://github.com/X11Libre/xf86-input-synaptics.git
synced 2026-03-24 01:34:04 +00:00
replace obsolete "pointer" typedef by void *
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
19d035d5ac
commit
c22ca42701
@@ -101,7 +101,7 @@ InitTypedAtom(DeviceIntPtr dev, const char *name, Atom type, int format,
|
||||
uint8_t val_8[9]; /* we never have more than 9 values in an atom */
|
||||
uint16_t val_16[9];
|
||||
uint32_t val_32[9];
|
||||
pointer converted;
|
||||
void *converted;
|
||||
|
||||
for (int i = 0; i < nvalues; i++) {
|
||||
switch (format) {
|
||||
@@ -392,7 +392,7 @@ InitDeviceProperties(InputInfoPtr pInfo)
|
||||
MakeAtom(XI_PROP_DEVICE_NODE, strlen(XI_PROP_DEVICE_NODE), TRUE);
|
||||
XIChangeDeviceProperty(pInfo->dev, prop_device_node, XA_STRING, 8,
|
||||
PropModeReplace, strlen(priv->device),
|
||||
(pointer) priv->device, FALSE);
|
||||
(void*) priv->device, FALSE);
|
||||
XISetDevicePropertyDeletable(pInfo->dev, prop_device_node, FALSE);
|
||||
}
|
||||
|
||||
|
||||
@@ -175,8 +175,8 @@ static XF86ModuleVersionInfo VersionRec = {
|
||||
{0, 0, 0, 0}
|
||||
};
|
||||
|
||||
static pointer
|
||||
SetupProc(pointer module, pointer options, int *errmaj, int *errmin)
|
||||
static void*
|
||||
SetupProc(void *module, void *options, int *errmaj, int *errmin)
|
||||
{
|
||||
xf86AddInputDriver(&SYNAPTICS, module, 0);
|
||||
return module;
|
||||
@@ -349,7 +349,7 @@ calculate_tap_hysteresis(SynapticsPrivate * priv, int range,
|
||||
* the log message.
|
||||
*/
|
||||
static int
|
||||
set_percent_option(pointer options, const char *optname,
|
||||
set_percent_option(void *options, const char *optname,
|
||||
const int range, const int offset, const int default_value)
|
||||
{
|
||||
int result;
|
||||
@@ -543,7 +543,7 @@ static void
|
||||
set_default_parameters(InputInfoPtr pInfo)
|
||||
{
|
||||
SynapticsPrivate *priv = pInfo->private; /* read-only */
|
||||
pointer opts = pInfo->options; /* read-only */
|
||||
void *opts = pInfo->options; /* read-only */
|
||||
SynapticsParameters *pars = &priv->synpara; /* modified */
|
||||
|
||||
int horizScrollDelta, vertScrollDelta; /* pixels */
|
||||
@@ -1583,7 +1583,7 @@ current_button_area(SynapticsParameters * para, int x, int y)
|
||||
}
|
||||
|
||||
static CARD32
|
||||
timerFunc(OsTimerPtr timer, CARD32 now, pointer arg)
|
||||
timerFunc(OsTimerPtr timer, CARD32 now, void *arg)
|
||||
{
|
||||
InputInfoPtr pInfo = arg;
|
||||
SynapticsPrivate *priv = (SynapticsPrivate *) (pInfo->private);
|
||||
|
||||
Reference in New Issue
Block a user