diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-10 10:38:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-10 10:42:30 +0200 |
| commit | 2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7 (patch) | |
| tree | a32e3d5f8bb662ba5c14a72d97a553c4927c0b76 /xorg-server/hw/xwin/InitOutput.c | |
| parent | d53900c52abc2402f978b72278712e4bcdbde9f2 (diff) | |
| parent | 889d7dd8e94a5538f388cc619115bf5c0b6fc0b7 (diff) | |
| download | vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.tar.gz vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.tar.bz2 vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 libXmu libxcb mesa xserver git update 10 Sep 2013
Conflicts:
mesalib/src/glsl/.gitignore
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winsetsp.c
Diffstat (limited to 'xorg-server/hw/xwin/InitOutput.c')
| -rw-r--r-- | xorg-server/hw/xwin/InitOutput.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c index 18d0aa2f8..defbbadd8 100644 --- a/xorg-server/hw/xwin/InitOutput.c +++ b/xorg-server/hw/xwin/InitOutput.c @@ -125,7 +125,7 @@ winClipboardShutdown(void) if (g_fClipboard && g_fClipboardLaunched && g_fClipboardStarted) { /* Synchronously destroy the clipboard window */ if (g_hwndClipboard != NULL) { - g_fClipboardStarted=FALSE; /* This is to avoid dead-locls caused by the clipboard thread still doing some stuff */ + g_fClipboardStarted=FALSE; /* This is to avoid dead-locls caused by the clipboard thread still doing some stuff */ SendMessage(g_hwndClipboard, WM_DESTROY, 0, 0); /* NOTE: g_hwndClipboard is set to NULL in winclipboardthread.c */ } @@ -417,7 +417,8 @@ winFixupPaths(void) { /* Open fontpath configuration file */ #if defined WIN32 && defined __MINGW32__ - static Bool once = False; +qsdf qsdf qsdf qsdf + static Bool once = False; char buffer[MAX_PATH]; snprintf(buffer, sizeof(buffer), "%s\\font-dirs", basedir); buffer[sizeof(buffer)-1] = 0; @@ -425,6 +426,7 @@ winFixupPaths(void) if (once) fontdirs = NULL; else once = True; #else +qsdfqsdf qsdf qsdf FILE *fontdirs = fopen(ETCX11DIR "/font-dirs", "rt"); #endif if (fontdirs != NULL) { |