(Fsplit_window): Treat width just like height;

[bpt/emacs.git] / src / mem-limits.h

diff --git a/src/mem-limits.h b/src/mem-limits.h
index 4ea8a18..5b8d9cc 100644 (file)
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -1,5 +1,5 @@
 /* Includes for memory limit warnings.
-   Copyright (C) 1990, 1993, 1994, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifdef MSDOS
 #include <dpmi.h>
@@ -29,10 +30,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/resource.h>
 #define BSD4_2                 /* Tell code below to use getrlimit.  */
 
-extern int __data_start;
-#define start_of_data()        &__data_start
+/* Old Linux startup code won't define __data_start.  */
+extern int etext, __data_start; weak_extern (__data_start)
+#define start_of_data()        (&__data_start ?: &etext)
 
-#else
+#else /* not _LIBC */
 
 #if defined (__osf__) && (defined (__mips) || defined (mips) || defined(__alpha))
 #include <sys/time.h>
@@ -88,19 +90,19 @@ extern char etext;
 #endif
 #endif
 
-#else  /* Not emacs */ 
+#else  /* not emacs */
 extern char etext;
 #define start_of_data() &etext
-#endif /* Not emacs */
+#endif /* not emacs */
 
-#endif /* _LIBC */
+#endif /* not _LIBC */
 
 
 /* start of data space; can be changed by calling malloc_init */
 static POINTER data_space_start;
 
 /* Number of bytes of writable memory we can expect to be able to get */
-static unsigned int lim_data;
+static unsigned long lim_data;
 
 #ifdef NO_LIM_DATA
 static void