Commit 5b582a4a authored by Adam Jackson's avatar Adam Jackson

Merge remote-tracking branch 'jeremyhu/master'

parents 1d4aa672 27ad2125
......@@ -178,7 +178,7 @@ static int darwin_x11_modifier_mask_list[] = {
0
};
static int darwin_all_modifier_mask_additions[] = { NX_SECONDARYFNMASK, };
static int darwin_all_modifier_mask_additions[] = { NX_SECONDARYFNMASK, 0 };
static void
DarwinUpdateModifiers(int pressed, // KeyPress or KeyRelease
......@@ -367,14 +367,12 @@ DarwinEQInit(void)
{
int *p;
for (p = darwin_x11_modifier_mask_list, darwin_all_modifier_mask = 0; *p;
p++) {
for (p = darwin_x11_modifier_mask_list; *p; p++) {
darwin_x11_modifier_mask |= *p;
}
for (p = darwin_all_modifier_mask_additions,
darwin_all_modifier_mask = darwin_x11_modifier_mask;
*p; p++) {
darwin_all_modifier_mask = darwin_x11_modifier_mask;
for (p = darwin_all_modifier_mask_additions; *p; p++) {
darwin_all_modifier_mask |= *p;
}
......@@ -387,7 +385,6 @@ DarwinEQInit(void)
*/
if (!darwinEvents) {
darwinEvents = InitEventList(GetMaximumEventsNum());
;
if (!darwinEvents)
FatalError("Couldn't allocate event buffer\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment