diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-05 07:36:16 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-05 07:36:16 +0100 |
| commit | 1cc98f5a48924d750fbef7ea6b05a1ba49c28589 (patch) | |
| tree | 24c2eebc8ef3536e89b355b099d844083646d190 /xorg-server/hw | |
| parent | 67c290de36ddc1caae94c0892157ac16b90e4f99 (diff) | |
| download | vcxsrv-1cc98f5a48924d750fbef7ea6b05a1ba49c28589.tar.gz vcxsrv-1cc98f5a48924d750fbef7ea6b05a1ba49c28589.tar.bz2 vcxsrv-1cc98f5a48924d750fbef7ea6b05a1ba49c28589.zip | |
xserver mesa xkbcomp git update 5 nov 2012
xserver: a194630f7f7b287cb4ea4a459df0745f4c0d4c1a
mesa: ccbfe3dde94cd50a4e6468cfeabf95c79c9d8072
xkbcomp: a68c5b7b29eb1433b1be73b50c4248e10eab8e64
Diffstat (limited to 'xorg-server/hw')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Events.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/winprefs.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Events.c b/xorg-server/hw/xfree86/common/xf86Events.c index 3ad34b543..9dabf103f 100644 --- a/xorg-server/hw/xfree86/common/xf86Events.c +++ b/xorg-server/hw/xfree86/common/xf86Events.c @@ -376,7 +376,7 @@ static void xf86ReleaseKeys(DeviceIntPtr pDev) { KeyClassPtr keyc; - int i, sigstate; + int i; if (!pDev || !pDev->key) return; diff --git a/xorg-server/hw/xwin/winprefs.c b/xorg-server/hw/xwin/winprefs.c index dbc5b5228..6cbd7ad80 100644 --- a/xorg-server/hw/xwin/winprefs.c +++ b/xorg-server/hw/xwin/winprefs.c @@ -645,6 +645,7 @@ winPrefsLoadPreferences(char *path) if (path) prefFile = fopen(path, "r"); +#ifdef __CYGWIN__ else { char defaultPrefs[] = "MENU rmenu {\n" @@ -656,6 +657,7 @@ winPrefsLoadPreferences(char *path) path = "built-in default"; prefFile = fmemopen(defaultPrefs, strlen(defaultPrefs), "r"); } +#endif if (!prefFile) { ErrorF("LoadPreferences: %s not found\n", path); |