--- a/src/mem-limits.h	Mon Aug 13 11:33:40 2007 +0200
+++ b/src/mem-limits.h	Mon Aug 13 11:35:02 2007 +0200
@@ -38,10 +38,6 @@
 #include <ulimit.h>
 #endif
 
-#ifdef MSDOS
-#include <dpmi.h>
-#endif
-
 /* Some systems need this before <sys/resource.h>.  */
 #include <sys/types.h>
 
@@ -70,16 +66,14 @@
 
 #ifndef BSD4_2
 #ifndef USG
-#ifndef MSDOS
-#ifndef WINDOWSNT
-#ifndef __CYGWIN32__
+#ifndef WIN32_NATIVE
+#ifndef CYGWIN
 #if defined(__linux__) && defined(powerpc)	/*Added Kaoru Fukui*/
 #else						/*Added Kaoru Fukui*/
 #include <sys/vlimit.h>
 #endif				/*Added by Fukui*/
-#endif /* not __CYGWIN32__ */
-#endif /* not WINDOWSNT */
-#endif /* not MSDOS */
+#endif /* not CYGWIN */
+#endif /* not WIN32_NATIVE */
 #endif /* not USG */
 #else /* if BSD4_2 */
 #include <sys/time.h>
@@ -96,7 +90,7 @@
 typedef char *POINTER;
 #endif
 
-#ifndef __CYGWIN32__
+#ifndef CYGWIN
 typedef unsigned long SIZE;
 #endif
 
@@ -104,11 +98,9 @@
 #define EXCEEDS_LISP_PTR(ptr) 0
 
 #ifdef BSD
-#ifndef DATA_SEG_BITS
 extern int etext;
 #define start_of_data() &etext
 #endif
-#endif
 
 #else  /* not emacs */
 extern char etext;
@@ -125,7 +117,7 @@
 /* Number of bytes of writable memory we can expect to be able to get */
 extern unsigned int lim_data;
 
-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)
 extern unsigned long static_heap_size;
 extern int initialized;
 static void
@@ -171,7 +163,7 @@
 }
 
 #else /* not USG */
-#if defined( WINDOWSNT )
+#if defined( WIN32_NATIVE )
 
 static void
 get_lim_data (void)
@@ -183,22 +175,11 @@
 #else
 #if !defined (BSD4_2) && !defined (__osf__)
 
-#ifdef MSDOS
-void
-get_lim_data (void)
-{
-  _go32_dpmi_meminfo info;
-
-  _go32_dpmi_get_free_memory_information (&info);
-  lim_data = info.available_memory;
-}
-#else /* not MSDOS */
 static void
 get_lim_data (void)
 {
   lim_data = vlimit (LIM_DATA, -1);
 }
-#endif /* not MSDOS */
 
 #else /* BSD4_2 */
 
@@ -215,7 +196,7 @@
 #endif
 }
 #endif /* BSD4_2 */
-#endif /* not WINDOWSNT */
+#endif /* not WIN32_NATIVE */
 #endif /* not USG */
 #endif /* not NO_LIM_DATA */
 #endif /* not HEAP_IN_DATA */