diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-14 15:29:28 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-14 15:29:28 +0930 |
| commit | 00db0f35acc00cb771ab1c23f35b0db1c25d81bb (patch) | |
| tree | e7c52660ec0673cf542a35ce66b536239bbd2e9e | |
| parent | da728f2127aaa5c1ed5d22bb9f3d0c8ff19e4933 (diff) | |
dix: InitAndStartDevices doesn't need a window parameter.
Leftover from the old pointer-keyboard pairing code, obsolete and gone now.
| -rw-r--r-- | dix/devices.c | 2 | ||||
| -rw-r--r-- | dix/main.c | 2 | ||||
| -rw-r--r-- | include/input.h | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/dix/devices.c b/dix/devices.c index 644ee29a0..05a6b51af 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -539,7 +539,7 @@ InitCoreDevices(void) * @return Success or error code on failure. */ int -InitAndStartDevices(WindowPtr root) +InitAndStartDevices() { DeviceIntPtr dev, next; diff --git a/dix/main.c b/dix/main.c index 5dce3dfd2..42d33091a 100644 --- a/dix/main.c +++ b/dix/main.c @@ -412,7 +412,7 @@ int main(int argc, char *argv[], char *envp[]) InitCoreDevices(); InitInput(argc, argv); - if (InitAndStartDevices(WindowTable[0]) != Success) + if (InitAndStartDevices() != Success) FatalError("failed to initialize core devices"); dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset); diff --git a/include/input.h b/include/input.h index ec6ac90e1..13902d77e 100644 --- a/include/input.h +++ b/include/input.h @@ -231,9 +231,7 @@ extern Bool ActivateDevice( extern Bool DisableDevice( DeviceIntPtr /*device*/); -extern int InitAndStartDevices( - WindowPtr /*root*/); - +extern int InitAndStartDevices(void); extern void CloseDownDevices(void); |