History

Fix compilation when using -DPTHREAD

We should have this defined for making use of futex locks instead of spin locks. When compiling with -DPTHREAD however, gcc gets confused at our declaration of arrow in devmouse.c, naming the members gives gcc enough of a hint that things work right.

Jacob Moody committed 5 years ago

Commit c5cba491 parent 4c9f5692 files · +5 −5Browse files

Unified · Split

2 files
  1. Make.linux +1 −1
  2. kern/devmouse.c +4 −4
Make.linux+1−1
@@ -5,7 +5,7 @@ AR=ar · 4 unmodified lines
5AS=as5AS=as
6RANLIB=ranlib6RANLIB=ranlib
7CC=gcc7CC=gcc
8CFLAGS=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -D_THREAD_SAFE $(PTHREAD) -O28CFLAGS=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -D_THREAD_SAFE -DPTHREAD $(PTHREAD) -O2
9O=o9O=o
10OS=posix10OS=posix
11GUI=wl11GUI=wl
kern/devmouse.c+4−4
@@ -11,14 +11,14 @@ · 10 unmodified lines
11Mouseinfo mouse;11Mouseinfo mouse;
12Cursorinfo cursor;12Cursorinfo cursor;
13Cursorinfo arrow = {13Cursorinfo arrow = {
14 0,14 .lk = 0,
15 { -1, -1 },15 .offset = { -1, -1 },
16 { 0xFF, 0xFF, 0x80, 0x01, 0x80, 0x02, 0x80, 0x0C,16 .clr = { 0xFF, 0xFF, 0x80, 0x01, 0x80, 0x02, 0x80, 0x0C,
17 0x80, 0x10, 0x80, 0x10, 0x80, 0x08, 0x80, 0x04,17 0x80, 0x10, 0x80, 0x10, 0x80, 0x08, 0x80, 0x04,
18 0x80, 0x02, 0x80, 0x01, 0x80, 0x02, 0x8C, 0x04,18 0x80, 0x02, 0x80, 0x01, 0x80, 0x02, 0x8C, 0x04,
19 0x92, 0x08, 0x91, 0x10, 0xA0, 0xA0, 0xC0, 0x40,19 0x92, 0x08, 0x91, 0x10, 0xA0, 0xA0, 0xC0, 0x40,
20 },20 },
21 { 0x00, 0x00, 0x7F, 0xFE, 0x7F, 0xFC, 0x7F, 0xF0,21 .set = { 0x00, 0x00, 0x7F, 0xFE, 0x7F, 0xFC, 0x7F, 0xF0,
22 0x7F, 0xE0, 0x7F, 0xE0, 0x7F, 0xF0, 0x7F, 0xF8,22 0x7F, 0xE0, 0x7F, 0xE0, 0x7F, 0xF0, 0x7F, 0xF8,
23 0x7F, 0xFC, 0x7F, 0xFE, 0x7F, 0xFC, 0x73, 0xF8,23 0x7F, 0xFC, 0x7F, 0xFE, 0x7F, 0xFC, 0x73, 0xF8,
24 0x61, 0xF0, 0x60, 0xE0, 0x40, 0x40, 0x00, 0x00,24 0x61, 0xF0, 0x60, 0xE0, 0x40, 0x40, 0x00, 0x00,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t