From c1937db3e578ce777b66db5cc8d14b66099902a8 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 25 Sep 1997 04:31:34 +0000 Subject: [PATCH] Only use get_ds_base function on true Windows. --- gdb/ChangeLog | 5 +++++ gdb/ser-e7kpc.c | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 651098a8dd8..695c972c9b3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 18 15:07:46 1997 Andrew Cagney + + * ser-e7kpc.c (get_ds_base): Only use under Windows. + (windows.h): Include when any _WIN32 host. + Wed Sep 24 18:12:47 1997 Stu Grossman * The following block of changes add support for debugging assembly diff --git a/gdb/ser-e7kpc.c b/gdb/ser-e7kpc.c index fac2c4508be..8cf6ec68a03 100644 --- a/gdb/ser-e7kpc.c +++ b/gdb/ser-e7kpc.c @@ -27,6 +27,9 @@ #ifdef _MSC_VER #define strncasecmp strnicmp #define WIN32_LEAN_AND_MEAN +#endif + +#ifdef _WIN32 #include #endif @@ -110,7 +113,7 @@ static struct sw {0x17, 0xdc000}, 0}; -#ifndef __GO32__ +#ifdef _MSC_VER /* Get the base of the data segment. This is needed to calculate the offset between data segment addresses and the base of linear memory, which is where device registers reside. Note that this is really only necessary for @@ -137,9 +140,9 @@ get_ds_base (void) return dsbase; } -#else /* !__GO32__ */ +#else /* !_MSC_VER */ #define get_ds_base() 0 -#endif /* __GO32__ */ +#endif /* _MSC_VER */ static int e7000pc_init () -- 2.30.2