JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* include/winnt.h: Remove merge conflict.

Browse Source
This commit is contained in:
Earnie Boyd
2002-01-25 13:13:55 +00:00
parent b6d314495b
commit d4b5d8fda2
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/w32api/ChangeLog
View File

@@ -1,3 +1,7 @@
2002-01-25 Earnie Boyd <earnie@users.sf.net>
* include/winnt.h: Remove merge conflict.
2002-01-25 Danny Smith <dannysmith@users.sourceforge.net> 2002-01-25 Danny Smith <dannysmith@users.sourceforge.net>
* include/winnt.h (_TCHAR): Add typedefs. * include/winnt.h (_TCHAR): Add typedefs.

13
winsup/w32api/include/winnt.h
View File

@@ -631,19 +631,10 @@ typedef BYTE BOOLEAN,*PBOOLEAN;
#define MEM_MAPPED 0x40000 #define MEM_MAPPED 0x40000
#define MEM_RESET 0x80000 #define MEM_RESET 0x80000
#define MEM_TOP_DOWN 0x100000 #define MEM_TOP_DOWN 0x100000
#define MEM_WRITE_WATCH 0x200000 /* 98/Me */
#define MEM_PHYSICAL 0x400000
#define MEM_4MB_PAGES 0x80000000 #define MEM_4MB_PAGES 0x80000000
#define MEM_IMAGE 16777216 #define MEM_IMAGE 16777216
<<<<<<< winnt.h
#define MEM_MAPPED 262144
#define MEM_PRIVATE 131072
#define MEM_DECOMMIT 16384
#define MEM_RELEASE 32768
#define MEM_PHYSICAL 0x400000
#define MEM_RESET 0x80000 /* NT */
#define MEM_TOP_DOWN 0x100000 /* NT */
#define MEM_WRITE_WATCH 0x200000 /* 98/Me */
=======
>>>>>>> 1.42
#define SEC_FILE 0x800000 #define SEC_FILE 0x800000
#define SEC_IMAGE 0x1000000 #define SEC_IMAGE 0x1000000
#define SEC_VLM 0x2000000 #define SEC_VLM 0x2000000