aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/hw/xwin')
-rw-r--r--xorg-server/hw/xwin/glx/indirect.c2
-rw-r--r--xorg-server/hw/xwin/win.h8
-rw-r--r--xorg-server/hw/xwin/winblock.c2
-rw-r--r--xorg-server/hw/xwin/wincmap.c2
-rw-r--r--xorg-server/hw/xwin/winconfig.c16
-rw-r--r--xorg-server/hw/xwin/winconfig.h26
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/wingc.c0
-rw-r--r--xorg-server/hw/xwin/winkeybd.c4
-rw-r--r--xorg-server/hw/xwin/winmultiwindowwindow.c6
-rw-r--r--xorg-server/hw/xwin/winpfbdd.c2
-rw-r--r--xorg-server/hw/xwin/winpixmap.c2
-rw-r--r--xorg-server/hw/xwin/winshaddd.c2
-rw-r--r--xorg-server/hw/xwin/winshadddnl.c2
-rw-r--r--xorg-server/hw/xwin/winshadgdi.c2
-rw-r--r--xorg-server/hw/xwin/winwakeup.c2
-rw-r--r--xorg-server/hw/xwin/winwindow.c4
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winwindowswm.c24
17 files changed, 53 insertions, 53 deletions
diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
index 495e366ca..32d227b31 100644
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -886,7 +886,7 @@ glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
GLWIN_TRACE_MSG("glxWinCopyWindow pWindow %p", pWindow);
- dixLookupResourceByType((pointer) &pGlxDraw, pWindow->drawable.id,
+ dixLookupResourceByType((void *) &pGlxDraw, pWindow->drawable.id,
__glXDrawableRes, NullClient, DixUnknownAccess);
/*
diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h
index 1d3448a44..63a92f5e3 100644
--- a/xorg-server/hw/xwin/win.h
+++ b/xorg-server/hw/xwin/win.h
@@ -574,7 +574,7 @@ typedef struct {
#endif
typedef struct {
- pointer value;
+ void *value;
XID id;
} WindowIDPairRec, *WindowIDPairPtr;
@@ -738,7 +738,7 @@ void winSetAuthorization(void);
void
winBlockHandler(ScreenPtr pScreen,
- pointer pTimeout, pointer pReadMask);
+ void *pTimeout, void *pReadMask);
#ifdef XWIN_NATIVEGDI
/*
@@ -1003,7 +1003,7 @@ winModifyPixmapHeaderNativeGDI(PixmapPtr pPixmap,
int iWidth, int iHeight,
int iDepth,
int iBitsPerPixel,
- int devKind, pointer pPixData);
+ int devKind, void *pPixData);
#endif
#ifdef XWIN_NATIVEGDI
@@ -1074,7 +1074,7 @@ Bool
void
winWakeupHandler(ScreenPtr pScreen,
- unsigned long ulResult, pointer pReadmask);
+ unsigned long ulResult, void *pReadmask);
/*
* winwindow.c
diff --git a/xorg-server/hw/xwin/winblock.c b/xorg-server/hw/xwin/winblock.c
index c3ef4becd..07e907828 100644
--- a/xorg-server/hw/xwin/winblock.c
+++ b/xorg-server/hw/xwin/winblock.c
@@ -37,7 +37,7 @@
/* See Porting Layer Definition - p. 6 */
void
winBlockHandler(ScreenPtr pScreen,
- pointer pTimeout, pointer pReadMask)
+ void *pTimeout, void *pReadMask)
{
#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
winScreenPriv(pScreen);
diff --git a/xorg-server/hw/xwin/wincmap.c b/xorg-server/hw/xwin/wincmap.c
index 283372a9f..4275265be 100644
--- a/xorg-server/hw/xwin/wincmap.c
+++ b/xorg-server/hw/xwin/wincmap.c
@@ -170,7 +170,7 @@ winUninstallColormap(ColormapPtr pmap)
/* Install the default cmap in place of the cmap to be uninstalled */
if (pmap->mid != pmap->pScreen->defColormap) {
- dixLookupResourceByType((pointer) &curpmap, pmap->pScreen->defColormap,
+ dixLookupResourceByType((void *) &curpmap, pmap->pScreen->defColormap,
RT_COLORMAP, NullClient, DixUnknownAccess);
(*pmap->pScreen->InstallColormap) (curpmap);
}
diff --git a/xorg-server/hw/xwin/winconfig.c b/xorg-server/hw/xwin/winconfig.c
index 11717a506..95b95bc73 100644
--- a/xorg-server/hw/xwin/winconfig.c
+++ b/xorg-server/hw/xwin/winconfig.c
@@ -106,7 +106,7 @@ winInfoRec g_winInfo = {
#ifdef XWIN_XF86CONFIG
serverLayoutRec g_winConfigLayout;
-static Bool ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p);
+static Bool ParseOptionValue(int scrnIndex, void *options, OptionInfoPtr p);
static Bool configLayout(serverLayoutPtr, XF86ConfLayoutPtr, char *);
static Bool configImpliedLayout(serverLayoutPtr, XF86ConfScreenPtr);
static Bool GetBoolValue(OptionInfoPtr p, const char *s);
@@ -187,7 +187,7 @@ winReadConfigfile()
/* Check if layout is given in the config file */
if (g_xf86configptr->conf_flags != NULL) {
char *dfltlayout = NULL;
- pointer optlist = g_xf86configptr->conf_flags->flg_option_lst;
+ void *optlist = g_xf86configptr->conf_flags->flg_option_lst;
if (optlist && winFindOption(optlist, "defaultserverlayout"))
dfltlayout =
@@ -591,7 +591,7 @@ winConfigScreens(void)
#ifdef XWIN_XF86CONFIG
char *
-winSetStrOption(pointer optlist, const char *name, char *deflt)
+winSetStrOption(void *optlist, const char *name, char *deflt)
{
OptionInfoRec o;
@@ -606,7 +606,7 @@ winSetStrOption(pointer optlist, const char *name, char *deflt)
}
int
-winSetBoolOption(pointer optlist, const char *name, int deflt)
+winSetBoolOption(void *optlist, const char *name, int deflt)
{
OptionInfoRec o;
@@ -618,7 +618,7 @@ winSetBoolOption(pointer optlist, const char *name, int deflt)
}
int
-winSetIntOption(pointer optlist, const char *name, int deflt)
+winSetIntOption(void *optlist, const char *name, int deflt)
{
OptionInfoRec o;
@@ -630,7 +630,7 @@ winSetIntOption(pointer optlist, const char *name, int deflt)
}
double
-winSetRealOption(pointer optlist, const char *name, double deflt)
+winSetRealOption(void *optlist, const char *name, double deflt)
{
OptionInfoRec o;
@@ -642,7 +642,7 @@ winSetRealOption(pointer optlist, const char *name, double deflt)
}
double
-winSetPercentOption(pointer optlist, const char *name, double deflt)
+winSetPercentOption(void *optlist, const char *name, double deflt)
{
OptionInfoRec o;
@@ -737,7 +737,7 @@ winFindOptionValue(XF86OptionPtr list, const char *name)
*/
static Bool
-ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p)
+ParseOptionValue(int scrnIndex, void *options, OptionInfoPtr p)
{
char *s, *end;
diff --git a/xorg-server/hw/xwin/winconfig.h b/xorg-server/hw/xwin/winconfig.h
index 94571ff71..798c779a6 100644
--- a/xorg-server/hw/xwin/winconfig.h
+++ b/xorg-server/hw/xwin/winconfig.h
@@ -58,15 +58,15 @@ typedef struct {
Bool inUse;
int videoRam;
int textClockFreq;
- pointer options;
+ void *options;
int screen; /* For multi-CRTC cards */
} GDevRec, *GDevPtr;
typedef struct {
char *identifier;
char *driver;
- pointer commonOptions;
- pointer extraOptions;
+ void *commonOptions;
+ void *extraOptions;
} IDevRec, *IDevPtr;
typedef struct {
@@ -81,19 +81,19 @@ typedef struct {
rgb whiteColour;
int defaultVisual;
char **modes;
- pointer options;
+ void *options;
} DispRec, *DispPtr;
typedef struct _confxvportrec {
char *identifier;
- pointer options;
+ void *options;
} confXvPortRec, *confXvPortPtr;
typedef struct _confxvadaptrec {
char *identifier;
int numports;
confXvPortPtr ports;
- pointer options;
+ void *options;
} confXvAdaptorRec, *confXvAdaptorPtr;
typedef struct _confscreenrec {
@@ -107,7 +107,7 @@ typedef struct _confscreenrec {
DispPtr displays;
int numxvadaptors;
confXvAdaptorPtr xvadaptors;
- pointer options;
+ void *options;
} confScreenRec, *confScreenPtr;
typedef enum {
@@ -142,7 +142,7 @@ typedef struct _serverlayoutrec {
screenLayoutPtr screens;
GDevPtr inactives;
IDevPtr inputs;
- pointer options;
+ void *options;
} serverLayoutRec, *serverLayoutPtr;
/*
@@ -233,11 +233,11 @@ typedef struct {
* Function prototypes
*/
-char *winSetStrOption(pointer optlist, const char *name, char *deflt);
-int winSetBoolOption(pointer optlist, const char *name, int deflt);
-int winSetIntOption(pointer optlist, const char *name, int deflt);
-double winSetRealOption(pointer optlist, const char *name, double deflt);
-double winSetPercentOption(pointer optlist, const char *name, double deflt);
+char *winSetStrOption(void *optlist, const char *name, char *deflt);
+int winSetBoolOption(void *optlist, const char *name, int deflt);
+int winSetIntOption(void *optlist, const char *name, int deflt);
+double winSetRealOption(void *optlist, const char *name, double deflt);
+double winSetPercentOption(void *optlist, const char *name, double deflt);
#ifdef XWIN_XF86CONFIG
XF86OptionPtr winFindOption(XF86OptionPtr list, const char *name);
diff --git a/xorg-server/hw/xwin/wingc.c b/xorg-server/hw/xwin/wingc.c
index aba398d0a..aba398d0a 100644..100755
--- a/xorg-server/hw/xwin/wingc.c
+++ b/xorg-server/hw/xwin/wingc.c
diff --git a/xorg-server/hw/xwin/winkeybd.c b/xorg-server/hw/xwin/winkeybd.c
index 54e1847d7..e74672529 100644
--- a/xorg-server/hw/xwin/winkeybd.c
+++ b/xorg-server/hw/xwin/winkeybd.c
@@ -51,7 +51,7 @@ static Bool g_winKeyState[NUM_KEYCODES];
*/
static void
- winKeybdBell(int iPercent, DeviceIntPtr pDeviceInt, pointer pCtrl, int iClass);
+ winKeybdBell(int iPercent, DeviceIntPtr pDeviceInt, void *pCtrl, int iClass);
static void
winKeybdCtrl(DeviceIntPtr pDevice, KeybdCtrl * pCtrl);
@@ -120,7 +120,7 @@ winTranslateKey(WPARAM wParam, LPARAM lParam)
/* Ring the keyboard bell (system speaker on PCs) */
static void
-winKeybdBell(int iPercent, DeviceIntPtr pDeviceInt, pointer pCtrl, int iClass)
+winKeybdBell(int iPercent, DeviceIntPtr pDeviceInt, void *pCtrl, int iClass)
{
/*
* We can't use Beep () here because it uses the PC speaker
diff --git a/xorg-server/hw/xwin/winmultiwindowwindow.c b/xorg-server/hw/xwin/winmultiwindowwindow.c
index 94956863b..2439ddb67 100644
--- a/xorg-server/hw/xwin/winmultiwindowwindow.c
+++ b/xorg-server/hw/xwin/winmultiwindowwindow.c
@@ -53,7 +53,7 @@ static void
winUpdateWindowsWindow(WindowPtr pWin);
static void
- winFindWindow(pointer value, XID id, pointer cdata);
+ winFindWindow(void *value, XID id, void *cdata);
static
void
@@ -728,7 +728,7 @@ winGetWindowID(WindowPtr pWin)
*/
static void
-winFindWindow(pointer value, XID id, pointer cdata)
+winFindWindow(void *value, XID id, void *cdata)
{
WindowIDPairPtr wi = (WindowIDPairPtr) cdata;
@@ -811,7 +811,7 @@ winMinimizeWindow(Window id)
winDebug("winMinimizeWindow\n");
- dixLookupResourceByType((pointer) &pWin, id, RT_WINDOW, NullClient,
+ dixLookupResourceByType((void *) &pWin, id, RT_WINDOW, NullClient,
DixUnknownAccess);
if (!pWin) {
ErrorF("%s: NULL pWin. Leaving\n", __FUNCTION__);
diff --git a/xorg-server/hw/xwin/winpfbdd.c b/xorg-server/hw/xwin/winpfbdd.c
index 12f3b172f..976eba9ad 100644
--- a/xorg-server/hw/xwin/winpfbdd.c
+++ b/xorg-server/hw/xwin/winpfbdd.c
@@ -306,7 +306,7 @@ winCloseScreenPrimaryDD(ScreenPtr pScreen)
pScreenInfo->pScreen = NULL;
/* Free the screen privates for this screen */
- free((pointer) pScreenPriv);
+ free((void *) pScreenPriv);
return fReturn;
}
diff --git a/xorg-server/hw/xwin/winpixmap.c b/xorg-server/hw/xwin/winpixmap.c
index 43c0c3c14..763d60e8c 100644
--- a/xorg-server/hw/xwin/winpixmap.c
+++ b/xorg-server/hw/xwin/winpixmap.c
@@ -170,7 +170,7 @@ Bool
winModifyPixmapHeaderNativeGDI(PixmapPtr pPixmap,
int iWidth, int iHeight,
int iDepth,
- int iBitsPerPixel, int devKind, pointer pPixData)
+ int iBitsPerPixel, int devKind, void *pPixData)
{
FatalError("winModifyPixmapHeaderNativeGDI ()\n");
return TRUE;
diff --git a/xorg-server/hw/xwin/winshaddd.c b/xorg-server/hw/xwin/winshaddd.c
index 5a117aace..59415515f 100644
--- a/xorg-server/hw/xwin/winshaddd.c
+++ b/xorg-server/hw/xwin/winshaddd.c
@@ -655,7 +655,7 @@ winCloseScreenShadowDD(ScreenPtr pScreen)
pScreenInfo->pScreen = NULL;
/* Free the screen privates for this screen */
- free((pointer) pScreenPriv);
+ free((void *) pScreenPriv);
return fReturn;
}
diff --git a/xorg-server/hw/xwin/winshadddnl.c b/xorg-server/hw/xwin/winshadddnl.c
index af13aba52..1ac1af06b 100644
--- a/xorg-server/hw/xwin/winshadddnl.c
+++ b/xorg-server/hw/xwin/winshadddnl.c
@@ -746,7 +746,7 @@ winCloseScreenShadowDDNL(ScreenPtr pScreen)
pScreenInfo->pScreen = NULL;
/* Free the screen privates for this screen */
- free((pointer) pScreenPriv);
+ free((void *) pScreenPriv);
return fReturn;
}
diff --git a/xorg-server/hw/xwin/winshadgdi.c b/xorg-server/hw/xwin/winshadgdi.c
index 9e981cea7..d2a357f8e 100644
--- a/xorg-server/hw/xwin/winshadgdi.c
+++ b/xorg-server/hw/xwin/winshadgdi.c
@@ -613,7 +613,7 @@ winCloseScreenShadowGDI(ScreenPtr pScreen)
pScreenInfo->pScreen = NULL;
/* Free the screen privates for this screen */
- free((pointer) pScreenPriv);
+ free((void *) pScreenPriv);
return fReturn;
}
diff --git a/xorg-server/hw/xwin/winwakeup.c b/xorg-server/hw/xwin/winwakeup.c
index 795221a1a..ebcb0fad9 100644
--- a/xorg-server/hw/xwin/winwakeup.c
+++ b/xorg-server/hw/xwin/winwakeup.c
@@ -39,7 +39,7 @@
/* See Porting Layer Definition - p. 7 */
void
winWakeupHandler(ScreenPtr pScreen,
- unsigned long ulResult, pointer pReadmask)
+ unsigned long ulResult, void *pReadmask)
{
MSG msg;
diff --git a/xorg-server/hw/xwin/winwindow.c b/xorg-server/hw/xwin/winwindow.c
index e3bac41d9..c67a1a610 100644
--- a/xorg-server/hw/xwin/winwindow.c
+++ b/xorg-server/hw/xwin/winwindow.c
@@ -39,7 +39,7 @@
*/
static int
- winAddRgn(WindowPtr pWindow, pointer data);
+ winAddRgn(WindowPtr pWindow, void *data);
static
void
@@ -417,7 +417,7 @@ winSetShapeRootless(WindowPtr pWin, int kind)
static
int
-winAddRgn(WindowPtr pWin, pointer data)
+winAddRgn(WindowPtr pWin, void *data)
{
int iX, iY, iWidth, iHeight, iBorder;
HRGN hRgn = *(HRGN *) data;
diff --git a/xorg-server/hw/xwin/winwindowswm.c b/xorg-server/hw/xwin/winwindowswm.c
index 36f4ce0ae..c61f5b79e 100644..100755
--- a/xorg-server/hw/xwin/winwindowswm.c
+++ b/xorg-server/hw/xwin/winwindowswm.c
@@ -53,8 +53,8 @@ static XID eventResource;
/* Currently selected events */
static unsigned int eventMask = 0;
-static int WMFreeClient(pointer data, XID id);
-static int WMFreeEvents(pointer data, XID id);
+static int WMFreeClient(void *data, XID id);
+static int WMFreeEvents(void *data, XID id);
static void SNotifyEvent(xWindowsWMNotifyEvent * from,
xWindowsWMNotifyEvent * to);
@@ -99,13 +99,13 @@ updateEventMask(WMEventPtr * pHead)
}
/*ARGSUSED*/ static int
-WMFreeClient(pointer data, XID id)
+WMFreeClient(void *data, XID id)
{
WMEventPtr pEvent;
WMEventPtr *pHead, pCur, pPrev;
pEvent = (WMEventPtr) data;
- dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
+ dixLookupResourceByType((void *) &pHead, eventResource, eventResourceType,
NullClient, DixUnknownAccess);
if (pHead) {
pPrev = 0;
@@ -119,12 +119,12 @@ WMFreeClient(pointer data, XID id)
}
updateEventMask(pHead);
}
- free((pointer) pEvent);
+ free((void *) pEvent);
return 1;
}
/*ARGSUSED*/ static int
-WMFreeEvents(pointer data, XID id)
+WMFreeEvents(void *data, XID id)
{
WMEventPtr *pHead, pCur, pNext;
@@ -132,9 +132,9 @@ WMFreeEvents(pointer data, XID id)
for (pCur = *pHead; pCur; pCur = pNext) {
pNext = pCur->next;
FreeResource(pCur->clientResource, ClientType);
- free((pointer) pCur);
+ free((void *) pCur);
}
- free((pointer) pHead);
+ free((void *) pHead);
eventMask = 0;
return 1;
}
@@ -147,7 +147,7 @@ ProcWindowsWMSelectInput(ClientPtr client)
XID clientResource;
REQUEST_SIZE_MATCH(xWindowsWMSelectInputReq);
- dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
+ dixLookupResourceByType((void *) &pHead, eventResource, eventResourceType,
client, DixWriteAccess);
if (stuff->mask != 0) {
if (pHead) {
@@ -174,7 +174,7 @@ ProcWindowsWMSelectInput(ClientPtr client)
*/
clientResource = FakeClientID(client->index);
pNewEvent->clientResource = clientResource;
- if (!AddResource(clientResource, ClientType, (pointer) pNewEvent))
+ if (!AddResource(clientResource, ClientType, (void *) pNewEvent))
return BadAlloc;
/*
* create a resource to contain a pointer to the list
@@ -185,7 +185,7 @@ ProcWindowsWMSelectInput(ClientPtr client)
if (!pHead) {
pHead = (WMEventPtr *) malloc(sizeof(WMEventPtr));
if (!pHead ||
- !AddResource(eventResource, eventResourceType, (pointer) pHead))
+ !AddResource(eventResource, eventResourceType, (void *) pHead))
{
FreeResource(clientResource, RT_NONE);
return BadAlloc;
@@ -236,7 +236,7 @@ winWindowsWMSendEvent(int type, unsigned int mask, int which, int arg,
xWindowsWMNotifyEvent se;
winDebug ("winWindowsWMSendEvent %d %d %d %d, %d %d - %d %d\n",
type, mask, which, arg, x, y, w, h);
- dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
+ dixLookupResourceByType((void *) &pHead, eventResource, eventResourceType,
NullClient, DixUnknownAccess);
if (!pHead)
return;