X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/4fc5845fe896177307f553d8af0d48834206c060..114f9c96795aff3b51b9060d7c9c1b77debcc99a:/src/w32heap.c

diff --git a/src/w32heap.c b/src/w32heap.c
index 7de08bb2b4..440388c6ea 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -1,12 +1,13 @@
 /* Heap management routines for GNU Emacs on the Microsoft W32 API.
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+                 2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+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.
+the Free Software Foundation, either version 3 of the License, 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
@@ -14,10 +15,9 @@ 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, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/*
    Geoff Voelker (voelker@cs.washington.edu)			     7-29-94
 */
 
@@ -27,6 +27,7 @@ Boston, MA 02110-1301, USA.
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "w32heap.h"
 #include "lisp.h"  /* for VALMASK */
@@ -41,10 +42,6 @@ OSVERSIONINFO osinfo_cache;
 
 unsigned long syspage_mask = 0;
 
-/* These are defined to get Emacs to compile, but are not used.  */
-int edata;
-int etext;
-
 /* The major and minor versions of NT.  */
 int w32_major_version;
 int w32_minor_version;
@@ -244,7 +241,7 @@ init_heap ()
 	  exit (1);
 	}
 
-#if defined (NO_UNION_TYPE) && !defined (USE_LSB_TAG)
+#if !defined (USE_LISP_UNION_TYPE) && !defined (USE_LSB_TAG)
       /* Ensure that the addresses don't use the upper tag bits since
 	 the Lisp type goes there.  */
       if (((unsigned long) data_region_base & ~VALMASK) != 0)