diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2011-10-05 17:34:50 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2011-10-05 17:34:50 +0100 |
| commit | fb4ad2f0df4181091a13f645665c7b1984a28944 (patch) | |
| tree | 731ce5d4125b4fee0f98f01154686a2e107fa26f /hw/xwin/InitOutput.c | |
| parent | ff11a8ecde1a49bac773ead364898dfabdea4a41 (diff) | |
| parent | 26f93136840099831246afa1c1517e112b5fca2f (diff) | |
Merge branch 'cygwin-aiglx-for-1.11' into cygwin-release-1.11xserver-cygwin-1.11.1-1
Conflicts:
hw/xwin/InitOutput.c
hw/xwin/winwindow.h
Diffstat (limited to 'hw/xwin/InitOutput.c')
| -rw-r--r-- | hw/xwin/InitOutput.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 1695ab8eb..a88b8fb37 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -55,6 +55,7 @@ typedef WINAPI HRESULT (*SHGETFOLDERPATHPROC)( LPTSTR pszPath ); #endif +#include "ddxhooks.h" /* * References to external symbols @@ -163,13 +164,12 @@ ddxPushProviders(void) #endif } -#if defined(DDXBEFORERESET) /* * Called right before KillAllClients when the server is going to reset, * allows us to shutdown our seperate threads cleanly. */ -void +static void ddxBeforeReset (void) { winDebug ("ddxBeforeReset - Hello\n"); @@ -178,13 +178,16 @@ ddxBeforeReset (void) winClipboardShutdown (); #endif } -#endif void ddxMain(void) { int iReturn; + /* Initialize DDX-specific hooks */ + ddxHooks.ddxBeforeReset = ddxBeforeReset; + ddxHooks.ddxPushProviders = ddxPushProviders; + /* Create & acquire the termination mutex */ iReturn = pthread_mutex_init (&g_pmTerminating, NULL); if (iReturn != 0) |