(Fdisplay_buffer): If we give up and try other frames,

[gnu-emacs] / src / w32heap.h

diff --git a/src/w32heap.h b/src/w32heap.h
index 2c96dc999ae6ffa3afd94be5fcecd82f50b0bcec..24ed080ff7f42ae98a43a5d0158083e4a5417267 100644 (file)
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -1,21 +1,22 @@
 /* Heap management routines (including unexec) for GNU Emacs on Windows NT.
    Copyright (C) 1994 Free Software Foundation, Inc.
 
-   This file is part of GNU Emacs.
+This file is part of GNU Emacs.
 
-   GNU Emacs is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any later
-   version.
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
 
-   GNU Emacs is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-   more details.
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+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.
+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, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
    Geoff Voelker (voelker@cs.washington.edu)                        7-29-94
 */
@@ -35,8 +36,8 @@
 #define get_page_size()                        sysinfo_cache.dwPageSize
 #define get_allocation_unit()          sysinfo_cache.dwAllocationGranularity
 #define get_processor_type()           sysinfo_cache.dwProcessorType
-#define get_nt_major_version()         nt_major_version
-#define get_nt_minor_version()         nt_minor_version
+#define get_w32_major_version()        w32_major_version
+#define get_w32_minor_version()        w32_minor_version
 
 extern unsigned char *get_data_start();
 extern unsigned char *get_data_end();
@@ -44,8 +45,8 @@ extern unsigned long  data_region_size;
 extern unsigned long  reserved_heap_size;
 extern SYSTEM_INFO    sysinfo_cache;
 extern BOOL          need_to_recreate_heap;
-extern int           nt_major_version;
-extern int           nt_minor_version;
+extern int           w32_major_version;
+extern int           w32_minor_version;
 
 /* Emulation of Unix sbrk().  */
 extern void *sbrk (unsigned long size);