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.
Unified · Split
| @@ -5,7 +5,7 @@ AR=ar · 4 unmodified lines | ||
| 5 | 5 | AS=as |
| 6 | 6 | RANLIB=ranlib |
| 7 | 7 | CC=gcc |
| 8 | −CFLAGS=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -D_THREAD_SAFE $(PTHREAD) -O2 | |
| 8 | +CFLAGS=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -D_THREAD_SAFE -DPTHREAD $(PTHREAD) -O2 | |
| 9 | 9 | O=o |
| 10 | 10 | OS=posix |
| 11 | 11 | GUI=wl |
| @@ -11,14 +11,14 @@ · 10 unmodified lines | ||
| 11 | 11 | Mouseinfo mouse; |
| 12 | 12 | Cursorinfo cursor; |
| 13 | 13 | Cursorinfo arrow = { |
| 14 | − 0, | |
| 15 | − { -1, -1 }, | |
| 16 | − { 0xFF, 0xFF, 0x80, 0x01, 0x80, 0x02, 0x80, 0x0C, | |
| 14 | + .lk = 0, | |
| 15 | + .offset = { -1, -1 }, | |
| 16 | + .clr = { 0xFF, 0xFF, 0x80, 0x01, 0x80, 0x02, 0x80, 0x0C, | |
| 17 | 17 | 0x80, 0x10, 0x80, 0x10, 0x80, 0x08, 0x80, 0x04, |
| 18 | 18 | 0x80, 0x02, 0x80, 0x01, 0x80, 0x02, 0x8C, 0x04, |
| 19 | 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 | 22 | 0x7F, 0xE0, 0x7F, 0xE0, 0x7F, 0xF0, 0x7F, 0xF8, |
| 23 | 23 | 0x7F, 0xFC, 0x7F, 0xFE, 0x7F, 0xFC, 0x73, 0xF8, |
| 24 | 24 | 0x61, 0xF0, 0x60, 0xE0, 0x40, 0x40, 0x00, 0x00, |