Using "_AX = (v);" in place of "mov ax,v;" to fix "ambiguous member" problem.

This was suggested in
https://sourceforge.net/p/freedos/mailman/message/36778205/

diff --git a/src/common/frotz.h b/src/common/frotz.h
index f81d71dac988be461fe3d1d2d7e8ccfd06559ee1..7fa0ed9e091dfe794b8e959fb1df009fc69e860a 100644 (file)
--- a/src/common/frotz.h
+++ b/src/common/frotz.h
@@ -397,24 +397,19 @@ extern zbyte *zmp;
 #define lo(v)   ((zbyte *)&v)[0]
 #define hi(v)   ((zbyte *)&v)[1]
 
-#if 0
-#define SET_WORD(addr,v) asm {\
-       les bx,zmp;\
-       add bx,addr;\
-       mov ax,v;\
-       xchg al,ah;\
-       mov es:[bx],ax }
-
-#define LOW_WORD(addr,v) asm {\
-       les bx,zmp;\
-       add bx,addr;\
-       mov ax,es:[bx];\
-       xchg al,ah;\
-       mov v,ax }
-#endif
-
-#define SET_WORD(addr,v)  { zmp[addr] = hi(v); zmp[addr+1] = lo(v); }
-#define LOW_WORD(addr,v)  { v = ((zword) zmp[addr] << 8) | zmp[addr+1]; }
+#define SET_WORD(addr, v) do {\
+       asm les bx,zmp;\
+       asm add bx,addr;\
+       _AX = (v); \
+       asm xchg al,ah;\
+       asm mov es:[bx],ax; } while (0);
+
+#define LOW_WORD(addr,v) do {\
+       asm les bx,zmp;\
+       asm add bx,addr;\
+       asm mov ax,es:[bx];\
+       asm xchg al,ah;\
+       (v) = _AX; } while (0);
 
 #define HIGH_WORD(addr,v) asm {\
        mov bx,word ptr zmp;\