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.

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";