diff options
| author | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2011-03-08 01:57:46 +0000 |
|---|---|---|
| committer | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2011-03-08 01:57:46 +0000 |
| commit | 6777e53972bd4587dca1d740a9b9e0622d5016ba (patch) | |
| tree | e077cb2fc2015e419d7676a15a1da79015308a7e | |
| parent | ec5563f3f49bdb5d868de27c1a4f137c2a1b4bbe (diff) | |
| download | newlib-6777e53972bd4587dca1d740a9b9e0622d5016ba.zip newlib-6777e53972bd4587dca1d740a9b9e0622d5016ba.tar.gz newlib-6777e53972bd4587dca1d740a9b9e0622d5016ba.tar.bz2 | |
2011-03-07 Chris Sutcliffe <ir0nh34d@users.sf.net>
* include/winbase.h (PSAPI_WORKING_SET_BLOCK,
PSAPI_WORKING_SET_INFORMATION): Move from here...
* include/psapi.h (PSAPI_WORKING_SET_BLOCK,
PSAPI_WORKING_SET_INFORMATION): ... to here.
| -rw-r--r-- | winsup/w32api/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/w32api/include/psapi.h | 16 | ||||
| -rw-r--r-- | winsup/w32api/include/winbase.h | 16 |
3 files changed, 23 insertions, 16 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 814e0c8..aa90984 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,10 @@ +2011-03-07 Chris Sutcliffe <ir0nh34d@users.sf.net> + + * include/winbase.h (PSAPI_WORKING_SET_BLOCK, + PSAPI_WORKING_SET_INFORMATION): Move from here... + * include/psapi.h (PSAPI_WORKING_SET_BLOCK, + PSAPI_WORKING_SET_INFORMATION): ... to here. + 2011-03-05 Chris Sutcliffe <ir0nh34d@users.sf.net> * include/w32api.h: Increment version to 3.16. diff --git a/winsup/w32api/include/psapi.h b/winsup/w32api/include/psapi.h index ba08fa0..cfde1d2 100644 --- a/winsup/w32api/include/psapi.h +++ b/winsup/w32api/include/psapi.h @@ -81,6 +81,22 @@ typedef struct _PERFORMANCE_INFORMATION { DWORD ThreadCount; } PERFORMANCE_INFORMATION, *PPERFORMANCE_INFORMATION; +typedef union _PSAPI_WORKING_SET_BLOCK { + ULONG_PTR Flags; + struct { + ULONG_PTR Protection :5; + ULONG_PTR ShareCount :3; + ULONG_PTR Shared :1; + ULONG_PTR Reserved :3; + ULONG_PTR VirtualPage :20; + } ; +} PSAPI_WORKING_SET_BLOCK, *PPSAPI_WORKING_SET_BLOCK; + +typedef struct _PSAPI_WORKING_SET_INFORMATION { + ULONG_PTR NumberOfEntries; + PSAPI_WORKING_SET_BLOCK WorkingSetInfo[1]; +} PSAPI_WORKING_SET_INFORMATION, *PPSAPI_WORKING_SET_INFORMATION; + /* Grouped by application,not in alphabetical order. */ BOOL WINAPI EnumProcesses(DWORD *,DWORD,DWORD *); BOOL WINAPI EnumProcessModules(HANDLE,HMODULE *,DWORD,LPDWORD); diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index c09f206..acb90fa 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -2647,22 +2647,6 @@ typedef PCACTCTXA PCACTCTX; #endif #endif -typedef union _PSAPI_WORKING_SET_BLOCK { - ULONG_PTR Flags; - struct { - ULONG_PTR Protection :5; - ULONG_PTR ShareCount :3; - ULONG_PTR Shared :1; - ULONG_PTR Reserved :3; - ULONG_PTR VirtualPage :20; - } ; -} PSAPI_WORKING_SET_BLOCK, *PPSAPI_WORKING_SET_BLOCK; - -typedef struct _PSAPI_WORKING_SET_INFORMATION { - ULONG_PTR NumberOfEntries; - PSAPI_WORKING_SET_BLOCK WorkingSetInfo[1]; -} PSAPI_WORKING_SET_INFORMATION, *PPSAPI_WORKING_SET_INFORMATION; - #ifdef __cplusplus } #endif |