diff options
| author | Konstantin Kirik (snegovick) <snegovick@uprojects.org> | 2025-12-04 18:36:51 +0300 |
|---|---|---|
| committer | Konstantin Kirik (snegovick) <snegovick@uprojects.org> | 2025-12-04 18:36:51 +0300 |
| commit | 81aba5a90629df36627242431f07c8e6324f48e3 (patch) | |
| tree | b839d2559b01ac0b4e583f6234ebdb0e53713661 | |
| parent | af3987f8d4ec692e102f5a376657651f2d698616 (diff) | |
Fix issue with multiple definitions of coherence, disable coherence call because its implementation is empty anyway. I failed to identify how to properly initialize coherence to leave call to it in place.
| -rw-r--r-- | emu/port/fns.h | 2 | ||||
| -rw-r--r-- | emu/port/lock.c | 2 | ||||
| -rw-r--r-- | emu/port/main.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/emu/port/fns.h b/emu/port/fns.h index 6a0809c0..36d341b7 100644 --- a/emu/port/fns.h +++ b/emu/port/fns.h @@ -20,7 +20,7 @@ Dir* chandirstat(Chan*); void cinit(void); char* clipread(void); int clipwrite(char*); -void (*coherence)(void); +extern void (*coherence)(void); void copen(Chan*); void cmderror(Cmdbuf*, char*); Block* concatblock(Block*); diff --git a/emu/port/lock.c b/emu/port/lock.c index 7028dbd8..9c53e7e0 100644 --- a/emu/port/lock.c +++ b/emu/port/lock.c @@ -34,7 +34,7 @@ canlock(Lock *l) void unlock(Lock *l) { - coherence(); +// coherence(); l->val = 0; } diff --git a/emu/port/main.c b/emu/port/main.c index 1d4b0e47..3d0f93bd 100644 --- a/emu/port/main.c +++ b/emu/port/main.c @@ -6,6 +6,7 @@ #include "draw.h" #include "version.h" +void (*coherence)(void) = nil; int rebootargc = 0; char** rebootargv; static char *imod = "/dis/emuinit.dis"; |