diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-19 18:10:46 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-19 18:10:46 -0500 |
| commit | 2d17f47cc7d6b174857617d31ad1b437d8e97d94 (patch) | |
| tree | 90fb5d8d63fa0c121eef355affce79d1d84a2bbe /dix/dispatch.c | |
| parent | 60be452c2e88342f92a76ba5ec7d90b5b0211aaf (diff) | |
| parent | ea9c63e93b9bb731796e8a8de2d127e6cc720076 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
Diffstat (limited to 'dix/dispatch.c')
| -rw-r--r-- | dix/dispatch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c index 0c8e6b133..dcd4b530f 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -250,7 +250,7 @@ UpdateCurrentTimeIf(void) currentTime = systime; } -void +static void InitSelections(void) { if (CurrentSelections) @@ -3842,7 +3842,7 @@ ProcInitialConnection(ClientPtr client) return (client->noClientException); } -int +static int SendConnSetup(ClientPtr client, char *reason) { xWindowRoot *root; |