* include/windef.h (PVOID, LPVOID): Move typedefs to...

	* include/winnt: ...here.
	(PVOID64): New typeddef.

	* include/winnt,h (FILE_SEGMENT_ELEMENT): Define union.
	* include/winbase.h: (ReadFileScatter, WriteFileGather):
	Add prototypes.

	* include/winnt,h (PROCESSOR_ARCHITECTURE_*): Add defines.
	(PROCESSOR_INTEL_IA64): Add define

4 files changed, 36 insertions, 1 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 9f46539da..b916f7302 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,16 @@
+2002-07-30  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/windef.h (PVOID): Move typedef to...
+	* include/winnt: ...here.
+	(PVOID64): New typeddef.
+
+	* include/winnt,h (FILE_SEGMENT_ELEMENT): Define union.
+	* include/winbase.h: (ReadFileScatter, WriteFileGather):
+	Add prototypes.
+
+	* include/winnt,h (PROCESSOR_ARCHITECTURE_*): Add defines.
+	(PROCESSOR_INTEL_IA64): Add define.
+
 2002-07-25  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/oleidl.h (MK_ALT): Define.
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index 3ed41abb5..f76b7fb52 100644
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -1442,6 +1442,7 @@ BOOL WINAPI ReadEventLogA(HANDLE,DWORD,DWORD,PVOID,DWORD,DWORD *,DWORD *);
 BOOL WINAPI ReadEventLogW(HANDLE,DWORD,DWORD,PVOID,DWORD,DWORD *,DWORD *);
 BOOL WINAPI ReadFile(HANDLE,PVOID,DWORD,PDWORD,LPOVERLAPPED);
 BOOL WINAPI ReadFileEx(HANDLE,PVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE);
+BOOL WINAPI ReadFileScatter(HANDLE,FILE_SEGMENT_ELEMENT,DWORD,LPDWORD,LPOVERLAPPED);
 BOOL WINAPI ReadProcessMemory(HANDLE,PCVOID,PVOID,DWORD,PDWORD);
 HANDLE WINAPI RegisterEventSourceA (LPCSTR,LPCSTR);
 HANDLE WINAPI RegisterEventSourceW(LPCWSTR,LPCWSTR);
@@ -1569,6 +1570,7 @@ BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD);
 BOOL WINAPI WinLoadTrustProvider(GUID*);
 BOOL WINAPI WriteFile(HANDLE,PCVOID,DWORD,PDWORD,LPOVERLAPPED);
 BOOL WINAPI WriteFileEx(HANDLE,PCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE);
+BOOL WINAPI WriteFileGather(HANDLE,FILE_SEGMENT_ELEMENT,DWORD,LPDWORD,LPOVERLAPPED);
 BOOL WINAPI WritePrivateProfileSectionA(LPCSTR,LPCSTR,LPCSTR);
 BOOL WINAPI WritePrivateProfileSectionW(LPCWSTR,LPCWSTR,LPCWSTR);
 BOOL WINAPI WritePrivateProfileStringA(LPCSTR,LPCSTR,LPCSTR,LPCSTR);
diff --git a/winsup/w32api/include/windef.h b/winsup/w32api/include/windef.h
index 24a84da9b..00900c0d0 100644
--- a/winsup/w32api/include/windef.h
+++ b/winsup/w32api/include/windef.h
@@ -228,7 +228,6 @@ typedef int *PINT,*LPINT;
 typedef WORD *PWORD,*LPWORD;
 typedef long *LPLONG;
 typedef DWORD *PDWORD,*LPDWORD;
-typedef void *PVOID,*LPVOID;
 typedef CONST void *PCVOID,*LPCVOID;
 typedef int INT;
 typedef unsigned int UINT,*PUINT,*LPUINT;
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index ea56b02d5..433756066 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -55,6 +55,14 @@ typedef unsigned short USHORT,*PUSHORT;
 typedef unsigned long ULONG,*PULONG;
 typedef char *PSZ;
 
+typedef void *PVOID,*LPVOID;
+
+/* FIXME for __WIN64 */
+#ifndef  __ptr64
+#define __ptr64
+#endif
+typedef void* __ptr64 PVOID64;
+
 #ifndef _WCHAR_T_DEFINED
 #define _WCHAR_T_DEFINED
 #ifndef _WCHAR_T_
@@ -581,10 +589,17 @@ typedef DWORD FLONG;
 #define PROCESSOR_INTEL_PENTIUM 586
 #define PROCESSOR_MIPS_R4000 4000
 #define PROCESSOR_ALPHA_21064 21064
+#define PROCESSOR_INTEL_IA64 2200
+
 #define PROCESSOR_ARCHITECTURE_INTEL 0
 #define PROCESSOR_ARCHITECTURE_MIPS 1
 #define PROCESSOR_ARCHITECTURE_ALPHA 2
 #define PROCESSOR_ARCHITECTURE_PPC 3
+#define PROCESSOR_ARCHITECTURE_SHX 4
+#define PROCESSOR_ARCHITECTURE_ARM 5
+#define PROCESSOR_ARCHITECTURE_IA64 6
+#define PROCESSOR_ARCHITECTURE_ALPHA64 7
+#define PROCESSOR_ARCHITECTURE_MSIL8
 #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF
 #define PF_FLOATING_POINT_PRECISION_ERRATA 0
 #define PF_FLOATING_POINT_EMULATED 1
@@ -2628,6 +2643,12 @@ typedef struct _REPARSE_POINT_INFORMATION {
 	WORD   UnparsedNameLength;
 } REPARSE_POINT_INFORMATION, *PREPARSE_POINT_INFORMATION;
 
+typedef union _FILE_SEGMENT_ELEMENT {
+	PVOID64 Buffer;
+	ULONGLONG Alignment;
+}FILE_SEGMENT_ELEMENT, *PFILE_SEGMENT_ELEMENT;
+
+
 #ifdef UNICODE
 typedef OSVERSIONINFOW OSVERSIONINFO,*POSVERSIONINFO,*LPOSVERSIONINFO;
 typedef OSVERSIONINFOEXW OSVERSIONINFOEX,*POSVERSIONINFOEX,*LPOSVERSIONINFOEX;