aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Sutcliffe <ir0nh34d@users.sourceforge.net>2009-08-30 23:20:52 +0000
committerChris Sutcliffe <ir0nh34d@users.sourceforge.net>2009-08-30 23:20:52 +0000
commit89b883512dec599f1812794d5cc8d7bd9b6eec98 (patch)
treebb1589de6b80e6c2935d6f0f7b5c3e2a456459eb
parent96d3d07383f35da219c152ae64088c19d2384b22 (diff)
downloadnewlib-89b883512dec599f1812794d5cc8d7bd9b6eec98.zip
newlib-89b883512dec599f1812794d5cc8d7bd9b6eec98.tar.gz
newlib-89b883512dec599f1812794d5cc8d7bd9b6eec98.tar.bz2
2009-08-30 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
* include/wtsapi32.h (WTSQuerySessionInformationA, WTSQuerySessionInformationW, WTSQuerySessionInformation, WTSFreeMemory): Moved to (_WIN32_WINNT >= 0x0500) guard. (thanks to Pierre Ossman)
-rw-r--r--winsup/w32api/ChangeLog7
-rw-r--r--winsup/w32api/include/wtsapi32.h18
2 files changed, 14 insertions, 11 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 96ee069..de57b11 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-30 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
+
+ * include/wtsapi32.h (WTSQuerySessionInformationA,
+ WTSQuerySessionInformationW, WTSQuerySessionInformation, WTSFreeMemory):
+ Moved to (_WIN32_WINNT >= 0x0500) guard.
+ (thanks to Pierre Ossman)
+
2009-08-09 Andy Koppe <andy.koppe@gmail.com>
* include/winnls.h (IS_HIGH_SURROGATE, IS_LOW_SURROGATE,
diff --git a/winsup/w32api/include/wtsapi32.h b/winsup/w32api/include/wtsapi32.h
index dcf95a5..f9f1802 100644
--- a/winsup/w32api/include/wtsapi32.h
+++ b/winsup/w32api/include/wtsapi32.h
@@ -70,18 +70,7 @@ typedef enum _WTS_CONNECTSTATE_CLASS {
BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags);
BOOL WINAPI WTSUnRegisterSessionNotification(HWND hWnd);
-BOOL WINAPI WTSQuerySessionInformationA(HANDLE hServer, DWORD SessionId, WTS_INFO_CLASS WTSInfoClass,
- LPSTR *ppBuffer, DWORD *pBytesReturned);
-BOOL WINAPI WTSQuerySessionInformationW(HANDLE hServer, DWORD SessionId, WTS_INFO_CLASS WTSInfoClass,
- LPTSTR *ppBuffer, DWORD *pBytesReturned);
BOOL WINAPI WTSQueryUserToken(ULONG SessionId, PHANDLE pToken);
-void WINAPI WTSFreeMemory(PVOID pMemory);
-
-#ifdef UNICODE
-#define WTSQuerySessionInformation WTSQuerySessionInformationW
-#else
-#define WTSQuerySessionInformation WTSQuerySessionInformationA
-#endif
#endif /* _WIN32_WINNT >= 0x0501 */
@@ -125,6 +114,10 @@ typedef struct _WTS_SESSION_INFOA {
#define WTS_EVENT_ALL 0x7FFFFFFF
#define WTS_EVENT_FLUSH 0x80000000
+BOOL WINAPI WTSQuerySessionInformationA(HANDLE hServer, DWORD SessionId, WTS_INFO_CLASS WTSInfoClass,
+ LPSTR *ppBuffer, DWORD *pBytesReturned);
+BOOL WINAPI WTSQuerySessionInformationW(HANDLE hServer, DWORD SessionId, WTS_INFO_CLASS WTSInfoClass,
+ LPTSTR *ppBuffer, DWORD *pBytesReturned);
BOOL WINAPI WTSWaitSystemEvent(HANDLE hServer, DWORD EventMask, DWORD* pEventFlags);
BOOL WINAPI WTSDisconnectSession(HANDLE hServer, DWORD SessionId, BOOL bWait);
BOOL WINAPI WTSEnumerateSessionsW(HANDLE hServer, DWORD Reserved, DWORD Version,
@@ -133,11 +126,14 @@ BOOL WINAPI WTSEnumerateSessionsW(HANDLE hServer, DWORD Reserved, DWORD Version,
BOOL WINAPI WTSEnumerateSessionsA(HANDLE hServer, DWORD Reserved, DWORD Version,
PWTS_SESSION_INFOA *ppSessionInfo,
PDWORD pCount);
+void WINAPI WTSFreeMemory(PVOID pMemory);
#ifdef UNICODE
#define WTSEnumerateSessions WTSEnumerateSessionsW
+#define WTSQuerySessionInformation WTSQuerySessionInformationW
#else
#define WTSEnumerateSessions WTSEnumerateSessionsA
+#define WTSQuerySessionInformation WTSQuerySessionInformationA
#endif
#endif /* _WIN32_WINNT >= 0x0500 */