X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/c86a406437166a1b2cbd8f5707ba70aeec8e1865..aa30fa6f3a4273adcfa1cba183a74a5aeb47b463:/src/w32heap.h

diff --git a/src/w32heap.h b/src/w32heap.h
index 77004e9bcd..82b59dd027 100644
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -1,12 +1,12 @@
 /* Heap management routines (including unexec) for GNU Emacs on Windows NT.
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001-2013 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 +14,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,14 +23,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))
 
 /*
  * Heap related stuff.
@@ -41,39 +31,20 @@ Boston, MA 02111-1307, USA.
 #define get_committed_heap_size()	(get_data_end () - get_data_start ())
 #define get_heap_start()		get_data_start ()
 #define get_heap_end()			get_data_end ()
-#define get_page_size()			sysinfo_cache.dwPageSize
-#define get_allocation_unit()		sysinfo_cache.dwAllocationGranularity
-#define get_processor_type()		sysinfo_cache.dwProcessorType
-#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();
-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;
 
-enum {
-  OS_WIN95 = 1,
-  OS_NT
-};
-
-extern int os_subtype;
+extern unsigned char *get_data_start (void);
+extern unsigned char *get_data_end (void);
+extern size_t         reserved_heap_size;
+extern BOOL   	      using_dynamic_heap;
 
 /* Emulation of Unix sbrk().  */
-extern void *sbrk (unsigned long size);
+extern void *sbrk (ptrdiff_t size);
 
 /* Initialize heap structures for sbrk on startup.  */
-extern void init_heap ();
+extern void init_heap (void);
 
 /* Round the heap to this size.  */
-extern void round_heap (unsigned long size);
-
-/* Cache system info, e.g., the NT page size.  */
-extern void cache_system_info (void);
+extern void round_heap (size_t size);
 
 /* ----------------------------------------------------------------- */
 /* Useful routines for manipulating memory-mapped files. */
@@ -86,15 +57,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);
@@ -104,6 +66,6 @@ IMAGE_SECTION_HEADER * find_section (char * name, IMAGE_NT_HEADERS * nt_header);
 
 /* Return pointer to section header for section containing the given
    relative virtual address. */
-IMAGE_SECTION_HEADER * rva_to_section (DWORD rva, IMAGE_NT_HEADERS * nt_header);
+IMAGE_SECTION_HEADER * rva_to_section (DWORD_PTR rva, IMAGE_NT_HEADERS * nt_header);
 
 #endif /* NTHEAP_H_ */