andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modesetting: Drop use of "pointer" for "void *"

Browse Source 
The xserver doesn't have that typedef.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eric Anholt 2014-08-26 11:41:46 -07:00
parent a10ea01475
commit 9c080f4496
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/drivers/modesetting/compat-api.h
View File

@ -48,7 +48,7 @@
#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS_DECL int arg, void * blockData, void * pTimeout, void * pReadmask
#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
@ -73,7 +73,7 @@
#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, void * pTimeout, void * pReadmask
#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen

6
hw/xfree86/drivers/modesetting/driver.c
View File

@ -153,8 +153,8 @@ static XF86ModuleVersionInfo VersRec = {
_X_EXPORT XF86ModuleData modesettingModuleData = { &VersRec, Setup, NULL };
static pointer
Setup(pointer module, pointer opts, int *errmaj, int *errmin)
static void *
Setup(void * module, void * opts, int *errmaj, int *errmin)
{
static Bool setupDone = 0;
@ -168,7 +168,7 @@ Setup(pointer module, pointer opts, int *errmaj, int *errmin)
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
return (pointer) 1;
return (void *) 1;
} else {
if (errmaj)
*errmaj = LDR_ONCEONLY;