modesetting: Drop use of "pointer" for "void *"
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:
parent
a10ea01475
commit
9c080f4496
@ -48,7 +48,7 @@
|
|||||||
|
|
||||||
#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
|
#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 BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
|
||||||
|
|
||||||
#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
|
#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 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 BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
|
||||||
|
|
||||||
#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
|
#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
|
||||||
|
@ -153,8 +153,8 @@ static XF86ModuleVersionInfo VersRec = {
|
|||||||
|
|
||||||
_X_EXPORT XF86ModuleData modesettingModuleData = { &VersRec, Setup, NULL };
|
_X_EXPORT XF86ModuleData modesettingModuleData = { &VersRec, Setup, NULL };
|
||||||
|
|
||||||
static pointer
|
static void *
|
||||||
Setup(pointer module, pointer opts, int *errmaj, int *errmin)
|
Setup(void * module, void * opts, int *errmaj, int *errmin)
|
||||||
{
|
{
|
||||||
static Bool setupDone = 0;
|
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
|
* The return value must be non-NULL on success even though there
|
||||||
* is no TearDownProc.
|
* is no TearDownProc.
|
||||||
*/
|
*/
|
||||||
return (pointer) 1;
|
return (void *) 1;
|
||||||
} else {
|
} else {
|
||||||
if (errmaj)
|
if (errmaj)
|
||||||
*errmaj = LDR_ONCEONLY;
|
*errmaj = LDR_ONCEONLY;
|
||||||
|
Loading…
Reference in New Issue
Block a user