History

fix drawterm compiles using gcc 10

-fno-common became the default, and and kmesg was relying on common symbols being merged.

Ori Bernstein committed 6 years ago

Commit d4043e91 parent bf3a3cd2 files · +6 −2Browse files

Unified · Split

2 files
  1. kern/dat.h +5 −2
  2. kern/devcons.c +1 −0
kern/dat.h+5−2
@@ -32,6 +32,7 @@ typedef struct Rgrp Rgrp; · 31 unmodified lines
32typedef struct RWlock RWlock;32typedef struct RWlock RWlock;
33typedef struct Waitq Waitq;33typedef struct Waitq Waitq;
34typedef struct Walkqid Walkqid;34typedef struct Walkqid Walkqid;
35typedef struct Kmesg Kmesg;
35typedef int Devgen(Chan*, char*, Dirtab*, int, int, Dir*);36typedef int Devgen(Chan*, char*, Dirtab*, int, int, Dir*);
36 37
37#include "fcall.h"38#include "fcall.h"
@@ -477,8 +478,10 @@ extern void _setproc(Proc*); · 439 unmodified lines
477 * Log console output so it can be retrieved via /dev/kmesg.478 * Log console output so it can be retrieved via /dev/kmesg.
478 * This is good for catching boot-time messages after the fact.479 * This is good for catching boot-time messages after the fact.
479 */480 */
480struct {481struct Kmesg {
481 Lock lk;482 Lock lk;
482 uint n;483 uint n;
483 char buf[16384];484 char buf[16384];
484} kmesg;485};
486
487extern Kmesg kmesg;
kern/devcons.c+1−0
@@ -13,6 +13,7 @@ · 12 unmodified lines
13 13
14void (*screenputs)(char*, int) = 0;14void (*screenputs)(char*, int) = 0;
15 15
16Kmesg kmesg; /* console messages */
16Queue* kbdq; /* unprocessed console input */17Queue* kbdq; /* unprocessed console input */
17Queue* lineq; /* processed console input */18Queue* lineq; /* processed console input */
18Queue* kprintoq; /* console output, for /dev/kprint */19Queue* kprintoq; /* console output, for /dev/kprint */

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