X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c86a406437166a1b2cbd8f5707ba70aeec8e1865..986fb647cc1df1edeeaa2c0e7cb34c100eb9efb9:/src/w32heap.h

diff --git a/src/w32heap.h b/src/w32heap.h
index 77004e9bcd..cbd7f7ae96 100644
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -1,12 +1,13 @@
 /* Heap management routines (including unexec) for GNU Emacs on Windows NT.
-   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,9 +15,7 @@ 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., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
    Geoff Voelker (voelker@cs.washington.edu)			     7-29-94
 */
@@ -25,11 +24,6 @@ Boston, MA 02111-1307, USA.
 #define NTHEAP_H_
 
 #include <windows.h>
-/* Emacs takes care of ensuring that these are defined.  */
-#ifdef max
-#undef max
-#undef min
-#endif
 
 #define ROUND_UP(p, align)   (((DWORD)(p) + (align)-1) & ~((align)-1))
 #define ROUND_DOWN(p, align) ((DWORD)(p) & ~((align)-1))
@@ -55,6 +49,7 @@ extern OSVERSIONINFO  osinfo_cache;
 extern BOOL   	      using_dynamic_heap;
 extern int    	      w32_major_version;
 extern int    	      w32_minor_version;
+extern int    	      w32_build_number;
 
 enum {
   OS_WIN95 = 1,
@@ -86,15 +81,6 @@ typedef struct file_data {
     unsigned char *file_base;
 } file_data;
 
-#define OFFSET_TO_RVA(var,section) \
-	  (section->VirtualAddress + ((DWORD)(var) - section->PointerToRawData))
-
-#define RVA_TO_OFFSET(var,section) \
-	  (section->PointerToRawData + ((DWORD)(var) - section->VirtualAddress))
-
-#define RVA_TO_PTR(var,section,filedata) \
-	  ((void *)(RVA_TO_OFFSET(var,section) + (filedata).file_base))
-
 int open_input_file (file_data *p_file, char *name);
 int open_output_file (file_data *p_file, char *name, unsigned long size);
 void close_file_data (file_data *p_file);
@@ -107,3 +93,6 @@ IMAGE_SECTION_HEADER * find_section (char * name, IMAGE_NT_HEADERS * nt_header);
 IMAGE_SECTION_HEADER * rva_to_section (DWORD rva, IMAGE_NT_HEADERS * nt_header);
 
 #endif /* NTHEAP_H_ */
+
+/* arch-tag: 3ba4cbe1-8a09-4a41-8f37-fd31f7426b3c
+   (do not change this comment) */