X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fntheap.h;h=091cf0ceb7c1e1a9409f5f5c96ca5cd38bc31d5d;hb=296255bdcdce5a2c39b20475bad2ac2ba25bfb84;hp=e991957aa87c43163971c6ec099bd4be48f44be1;hpb=716cfba952c1dc0d2cf5c968971f3780ba728a89;p=chise%2Fxemacs-chise.git- diff --git a/src/ntheap.h b/src/ntheap.h index e991957..091cf0c 100644 --- a/src/ntheap.h +++ b/src/ntheap.h @@ -51,7 +51,7 @@ 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) /* Emulation of Unix sbrk(). */ @@ -80,11 +80,11 @@ extern unsigned char *round_to_next (unsigned char *address, /* 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; + const char *name; + unsigned long size; + HANDLE file; + HANDLE file_mapping; + char *file_base; } file_data; #define OFFSET_TO_RVA(var,section) \ @@ -96,8 +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, CONST char *name); -int open_output_file (file_data *p_file, CONST 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); #endif /* INCLUDED_ntheap_h_ */