diff options
| author | Earnie Boyd <earnie@users.sf.net> | 2002-01-25 16:13:55 +0300 |
|---|---|---|
| committer | Earnie Boyd <earnie@users.sf.net> | 2002-01-25 16:13:55 +0300 |
| commit | d4b5d8fda2d99ca39ee147bff592c0f84a0249d5 (patch) | |
| tree | 5110e49df0ddc51d008e828056580d86cacde73c | |
| parent | b6d314495b66f99779d02953c9e4a5da622ff600 (diff) | |
* include/winnt.h: Remove merge conflict.
| -rw-r--r-- | winsup/w32api/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/w32api/include/winnt.h | 13 |
2 files changed, 6 insertions, 11 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index f6d59ca7a..407e5e854 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -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> * include/winnt.h (_TCHAR): Add typedefs. diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index 1ff59986b..7276945c8 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -631,19 +631,10 @@ typedef BYTE BOOLEAN,*PBOOLEAN; #define MEM_MAPPED 0x40000 #define MEM_RESET 0x80000 #define MEM_TOP_DOWN 0x100000 +#define MEM_WRITE_WATCH 0x200000 /* 98/Me */ +#define MEM_PHYSICAL 0x400000 #define MEM_4MB_PAGES 0x80000000 #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_IMAGE 0x1000000 #define SEC_VLM 0x2000000 |