2003-05-30 Bang Jun-Young <junyoung@netbsd.org>

	* include/winbase.h (HeapCompact): Correct prototype.
	* include/winnt.h (SINGLE_LIST_ENTRY, SLIST_ENTRY,
	SLIST_HEADER): Add.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 49d2390..27a81e2 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-30  Bang Jun-Young  <junyoung@netbsd.org>
+
+       * include/winbase.h (HeapCompact): Correct prototype.
+       * include/winnt.h (SINGLE_LIST_ENTRY, SLIST_ENTRY,
+       SLIST_HEADER): Add.
+
 2003-05-27  Andrew C. Stadt <acstadt@sympatico.ca>
 
        * include/winuser.h (LWA_COLORKEY, LWA_ALPHA): Add defines.

diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index 501e3b0..7abb4e2 100644 (file)
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -1354,7 +1354,7 @@ BOOL WINAPI GlobalUnWire(HGLOBAL);
 PVOID WINAPI GlobalWire(HGLOBAL);
 #define HasOverlappedIoCompleted(lpOverlapped)  ((lpOverlapped)->Internal != STATUS_PENDING)
 PVOID WINAPI HeapAlloc(HANDLE,DWORD,DWORD);
-UINT WINAPI HeapCompact(HANDLE,DWORD);
+SIZE_T WINAPI HeapCompact(HANDLE,DWORD);
 HANDLE WINAPI HeapCreate(DWORD,DWORD,DWORD);
 BOOL WINAPI HeapDestroy(HANDLE);
 BOOL WINAPI HeapFree(HANDLE,DWORD,PVOID);

diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index db1f36f..4d91016 100644 (file)
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -2047,6 +2047,25 @@ typedef struct _LIST_ENTRY {
        struct _LIST_ENTRY *Flink;
        struct _LIST_ENTRY *Blink;
 } LIST_ENTRY,*PLIST_ENTRY;
+typedef struct _SINGLE_LIST_ENTRY {
+       struct _SINGLE_LIST_ENTRY *Next;
+} SINGLE_LIST_ENTRY,*PSINGLE_LIST_ENTRY;
+
+#ifndef _SLIST_HEADER_
+#define _SLIST_HEADER_
+#define SLIST_ENTRY SINGLE_LIST_ENTRY
+#define _SLIST_ENTRY _SINGLE_LIST_ENTRY
+#define PSLIST_ENTRY PSINGLE_LIST_ENTRY
+typedef union _SLIST_HEADER {
+       ULONGLONG Alignment;
+       struct {
+               SLIST_ENTRY Next;
+               WORD Depth;
+               WORD Sequence;
+       };
+} SLIST_HEADER,*PSLIST_HEADER;
+#endif /* !_SLIST_HEADER_ */
+
 typedef struct _RTL_CRITICAL_SECTION_DEBUG {
        WORD Type;
        WORD CreatorBackTraceIndex;