Merge from emacs--rel--22

[gnu-emacs] / src / w32heap.h

diff --git a/src/w32heap.h b/src/w32heap.h
index 2ff0220577230a20ef8d174d006dd6f2ae95a2ed..0d990305e8d50c55a0ebeb9e1ea2757a8ea130bc 100644 (file)
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -1,11 +1,12 @@
 /* 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  Free Software Foundation, Inc.
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -15,8 +16,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, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
    Geoff Voelker (voelker@cs.washington.edu)                        7-29-94
 */
@@ -46,9 +47,11 @@ extern unsigned char *get_data_start();
 extern unsigned char *get_data_end();
 extern unsigned long  reserved_heap_size;
 extern SYSTEM_INFO    sysinfo_cache;
+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,
@@ -80,15 +83,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);
@@ -101,3 +95,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) */