X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fntheap.h;h=091cf0ceb7c1e1a9409f5f5c96ca5cd38bc31d5d;hb=296255bdcdce5a2c39b20475bad2ac2ba25bfb84;hp=8c28ff007d6d2654d14316be5c6249464117c43d;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git-

diff --git a/src/ntheap.h b/src/ntheap.h
index 8c28ff0..091cf0c 100644
--- a/src/ntheap.h
+++ b/src/ntheap.h
@@ -23,8 +23,8 @@ 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>
 
@@ -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);
 
@@ -87,11 +80,11 @@ extern unsigned char *round_to_next (unsigned char *address,
 /* Useful routines for manipulating memory-mapped files. */
 
 typedef struct file_data {
-    char          *name;
-    unsigned long  size;
-    HANDLE         file;
-    HANDLE         file_mapping;
-    unsigned char *file_base;
+  const char    *name;
+  unsigned long  size;
+  HANDLE         file;
+  HANDLE         file_mapping;
+  char *file_base;
 } file_data;
 
 #define OFFSET_TO_RVA(var,section) \
@@ -103,12 +96,8 @@ typedef struct file_data {
 #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);
+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);
 
-/* 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);
-
-#endif /* NTHEAP_H_ */
+#endif /* INCLUDED_ntheap_h_ */