X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fntheap.h;h=bd36dd493c858fbdf3784c3e856ef111ff5cb8ff;hb=4f9f80ecf7b7c7a9dd3ee4c988813f28291825d3;hp=1d193a3f922b81034747bd7a754530d27cb674bb;hpb=ea1ea793fe6e244ef5555ed983423a204101af13;p=chise%2Fxemacs-chise.git.1

diff --git a/src/ntheap.h b/src/ntheap.h
index 1d193a3..bd36dd4 100644
--- a/src/ntheap.h
+++ b/src/ntheap.h
@@ -23,10 +23,10 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 /* Adapted for XEmacs by David Hobley <david@spook-le0.cia.com.au> */
 /* Synced with FSF Emacs 19.34.6 by Marc Paquette <marcpa@cam.org> */
 
-#ifndef NTHEAP_H_
-#define NTHEAP_H_
+#ifndef INCLUDED_ntheap_h_
+#define INCLUDED_ntheap_h_
 
-#include <windows.h>
+#include "syswindows.h"
 
 /*
  * Heap related stuff.
@@ -51,16 +51,9 @@ extern int    	      nt_minor_version;
 
 /* To prevent zero-initialized variables from being placed into the bss
    section, use non-zero values to represent an uninitialized state.  */
-#define UNINIT_PTR ((void *) 0xF0A0F0A0)
+#define UNINIT_PTR ((unsigned char*) 0xF0A0F0A0)
 #define UNINIT_LONG (0xF0A0F0A0L)
 
-enum {
-  OS_WIN95 = 1,
-  OS_NT
-};
-
-extern int os_subtype;
-
 /* Emulation of Unix sbrk().  */
 extern void *sbrk (unsigned long size);
 
@@ -83,28 +76,4 @@ extern void cache_system_info (void);
 extern unsigned char *round_to_next (unsigned char *address, 
 				     unsigned long align);
 
-/* ----------------------------------------------------------------- */
-/* Useful routines for manipulating memory-mapped files. */
-
-typedef struct file_data {
-    CONST char    *name;
-    unsigned long  size;
-    HANDLE         file;
-    HANDLE         file_mapping;
-    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, CONST char *name);
-int open_output_file (file_data *p_file, CONST char *name, unsigned long size);
-void close_file_data (file_data *p_file);
-
-#endif /* NTHEAP_H_ */
+#endif /* INCLUDED_ntheap_h_ */