Only use get_ds_base function on true Windows.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 651098a8dd862ed06dba88599540620836a9f7e6..695c972c9b38021069e07007ce9921797b0f9317 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 18 15:07:46 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+       * 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  <grossman@babylon-5.cygnus.com>
 
        * The following block of changes add support for debugging assembly

diff --git a/gdb/ser-e7kpc.c b/gdb/ser-e7kpc.c
index fac2c4508bebfa91c21bef3a9490aff849a7ce94..8cf6ec68a033a0d7e82fafcade6b01185fa85741 100644 (file)
--- 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 <windows.h>
 #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 ()