Fixed ANSI compabillity.
diff --git a/debugger/db_disasm.c b/debugger/db_disasm.c
index c7ad0e2..6f03300 100644
--- a/debugger/db_disasm.c
+++ b/debugger/db_disasm.c
@@ -1005,7 +1005,12 @@
static void db_task_printsym(unsigned int addr, int size)
{
- DBG_ADDR address = { NULL, 0, addr };
+ DBG_ADDR address;
+
+ address.type = NULL;
+ address.seg = 0;
+ address.off = addr;
+
DEBUG_PrintAddress( &address, db_disasm_16 ? 16 : 32, TRUE );
}
diff --git a/debugger/dbg.y b/debugger/dbg.y
index 3d90b99..5c15c1e 100644
--- a/debugger/dbg.y
+++ b/debugger/dbg.y
@@ -236,10 +236,13 @@
}
}
| tBREAK tNUM tEOL { struct name_hash *nh;
- DBG_ADDR addr = { NULL,
- CS_reg(&DEBUG_context),
- EIP_reg(&DEBUG_context) };
+ DBG_ADDR addr;
TDB *pTask = (TDB*)GlobalLock16( GetCurrentTask() );
+
+ addr.type = NULL;
+ addr.seg = CS_reg(&DEBUG_context);
+ addr.off = EIP_reg(&DEBUG_context);
+
if (ISV86(&DEBUG_context))
addr.seg |= (DWORD)(pTask?(pTask->hModule):0)<<16;
DBG_FIX_ADDR_SEG( &addr, CS_reg(&DEBUG_context) );
@@ -258,10 +261,13 @@
}
}
- | tBREAK tEOL { DBG_ADDR addr = { NULL,
- CS_reg(&DEBUG_context),
- EIP_reg(&DEBUG_context) };
+ | tBREAK tEOL { DBG_ADDR addr;
TDB *pTask = (TDB*)GlobalLock16( GetCurrentTask() );
+
+ addr.type = NULL;
+ addr.seg = CS_reg(&DEBUG_context);
+ addr.off = EIP_reg(&DEBUG_context);
+
if (ISV86(&DEBUG_context))
addr.seg |= (DWORD)(pTask?(pTask->hModule):0)<<16;
GlobalUnlock16( GetCurrentTask() );
diff --git a/debugger/stack.c b/debugger/stack.c
index a73ec0a..68b141b 100644
--- a/debugger/stack.c
+++ b/debugger/stack.c
@@ -51,7 +51,11 @@
*/
void DEBUG_InfoStack(void)
{
- DBG_ADDR addr = { NULL, SS_reg(&DEBUG_context), ESP_reg(&DEBUG_context) };
+ DBG_ADDR addr;
+
+ addr.type = NULL;
+ addr.seg = SS_reg(&DEBUG_context);
+ addr.off = ESP_reg(&DEBUG_context);
fprintf(stderr,"Stack dump:\n");
if (IS_SELECTOR_32BIT(addr.seg))