diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
| commit | b7f01cb1f6cfd1ec301f650a073436c91ec614aa (patch) | |
| tree | 1dbf32344313ad7e5884e6686251cad398a231fa /xorg-server/hw/dmx/input/dmxconsole.h | |
| parent | 7b4b94b4449aec056c4c92f5cacc2f89a292a80e (diff) | |
| parent | 1b0fcca503ae9cf2d462b60770f96c794dfbb27a (diff) | |
| download | vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.gz vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.bz2 vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkeyboard-config xserver git update 15 jan 2014
randrproto libfontenc mesa xserver git update 10 Jan 2014
randsrproto fontconfig libX11 git update 6 Jan 2014
Conflicts:
mesalib/src/glsl/builtin_functions.cpp
mesalib/src/glsl/ir_builder.h
xorg-server/Xext/xres.c
xorg-server/dix/dispatch.c
xorg-server/dix/dixfonts.c
xorg-server/hw/xwin/wingc.c
xorg-server/hw/xwin/winwindowswm.c
xorg-server/include/gc.h
xorg-server/os/access.c
Diffstat (limited to 'xorg-server/hw/dmx/input/dmxconsole.h')
| -rw-r--r-- | xorg-server/hw/dmx/input/dmxconsole.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/hw/dmx/input/dmxconsole.h b/xorg-server/hw/dmx/input/dmxconsole.h index 1c5261101..ea6033c3a 100644 --- a/xorg-server/hw/dmx/input/dmxconsole.h +++ b/xorg-server/hw/dmx/input/dmxconsole.h @@ -37,8 +37,8 @@ #ifndef _DMXCONSOLE_H_ #define _DMXCONSOLE_H_ -extern pointer dmxConsoleCreatePrivate(DeviceIntPtr pDevice); -extern void dmxConsoleDestroyPrivate(pointer private); +extern void *dmxConsoleCreatePrivate(DeviceIntPtr pDevice); +extern void dmxConsoleDestroyPrivate(void *private); extern void dmxConsoleInit(DevicePtr pDev); extern void dmxConsoleReInit(DevicePtr pDev); extern void dmxConsoleMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info); @@ -48,12 +48,12 @@ extern void dmxConsoleCollectEvents(DevicePtr pDev, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block); -extern int dmxConsoleFunctions(pointer private, DMXFunctionType function); -extern void dmxConsoleUpdatePosition(pointer private, int x, int y); -extern void dmxConsoleKbdSetCtrl(pointer private, KeybdCtrl * ctrl); +extern int dmxConsoleFunctions(void *private, DMXFunctionType function); +extern void dmxConsoleUpdatePosition(void *private, int x, int y); +extern void dmxConsoleKbdSetCtrl(void *private, KeybdCtrl * ctrl); extern void dmxConsoleCapture(DMXInputInfo * dmxInput); extern void dmxConsoleUncapture(DMXInputInfo * dmxInput); -extern void dmxConsoleUpdateInfo(pointer private, +extern void dmxConsoleUpdateInfo(void *private, DMXUpdateType, WindowPtr pWindow); #endif |