Fix includes + pkgconfig file

This patch fixes some winpr includes when used with C++.
It also fix the pkgconfig file as Stream_New has changed of
library.
This commit is contained in:
Hardening 2013-03-29 23:37:13 +01:00
parent 5ebdac1b48
commit 4a92e370e0
3 changed files with 9 additions and 9 deletions

View File

@ -8,6 +8,6 @@ Description: A free remote desktop protocol client
URL: http://www.freerdp.com/ URL: http://www.freerdp.com/
Version: @FREERDP_VERSION_FULL@ Version: @FREERDP_VERSION_FULL@
Requires: Requires:
Libs: -L${libdir} -lfreerdp-cache -lfreerdp-codec -lfreerdp-core -lfreerdp-crypto -lfreerdp-gdi -lfreerdp-locale -lfreerdp-rail -lfreerdp-utils -lwinpr-sspi -lwinpr-rpc Libs: -L${libdir} -lfreerdp-cache -lfreerdp-codec -lfreerdp-core -lfreerdp-crypto -lfreerdp-gdi -lfreerdp-locale -lfreerdp-rail -lfreerdp-utils -lwinpr-sspi -lwinpr-rpc -lwinpr-utils
Cflags: -I${includedir} Cflags: -I${includedir}

View File

@ -2908,7 +2908,7 @@ WINPR_API UINT GetErrorMode(void);
WINPR_API UINT SetErrorMode(UINT uMode); WINPR_API UINT SetErrorMode(UINT uMode);
WINPR_API DWORD GetLastError(VOID); WINPR_API DWORD GetLastError(void);
WINPR_API VOID SetLastError(DWORD dwErrCode); WINPR_API VOID SetLastError(DWORD dwErrCode);

View File

@ -107,8 +107,8 @@ WINPR_API BOOL CreateProcessAsUserW(HANDLE hToken, LPCWSTR lpApplicationName, LP
WINPR_API VOID ExitProcess(UINT uExitCode); WINPR_API VOID ExitProcess(UINT uExitCode);
WINPR_API HANDLE _GetCurrentProcess(VOID); WINPR_API HANDLE _GetCurrentProcess(void);
WINPR_API DWORD GetCurrentProcessId(VOID); WINPR_API DWORD GetCurrentProcessId(void);
WINPR_API BOOL TerminateProcess(HANDLE hProcess, UINT uExitCode); WINPR_API BOOL TerminateProcess(HANDLE hProcess, UINT uExitCode);
@ -125,24 +125,24 @@ WINPR_API HANDLE CreateRemoteThread(HANDLE hProcess, LPSECURITY_ATTRIBUTES lpThr
WINPR_API VOID ExitThread(DWORD dwExitCode); WINPR_API VOID ExitThread(DWORD dwExitCode);
WINPR_API HANDLE _GetCurrentThread(VOID); WINPR_API HANDLE _GetCurrentThread(void);
WINPR_API DWORD GetCurrentThreadId(VOID); WINPR_API DWORD GetCurrentThreadId(void);
WINPR_API DWORD ResumeThread(HANDLE hThread); WINPR_API DWORD ResumeThread(HANDLE hThread);
WINPR_API DWORD SuspendThread(HANDLE hThread); WINPR_API DWORD SuspendThread(HANDLE hThread);
WINPR_API BOOL SwitchToThread(VOID); WINPR_API BOOL SwitchToThread(void);
WINPR_API BOOL TerminateThread(HANDLE hThread, DWORD dwExitCode); WINPR_API BOOL TerminateThread(HANDLE hThread, DWORD dwExitCode);
/* Processor */ /* Processor */
WINPR_API DWORD GetCurrentProcessorNumber(VOID); WINPR_API DWORD GetCurrentProcessorNumber(void);
/* Thread-Local Storage */ /* Thread-Local Storage */
#define TLS_OUT_OF_INDEXES ((DWORD) 0xFFFFFFFF) #define TLS_OUT_OF_INDEXES ((DWORD) 0xFFFFFFFF)
WINPR_API DWORD TlsAlloc(VOID); WINPR_API DWORD TlsAlloc(void);
WINPR_API LPVOID TlsGetValue(DWORD dwTlsIndex); WINPR_API LPVOID TlsGetValue(DWORD dwTlsIndex);
WINPR_API BOOL TlsSetValue(DWORD dwTlsIndex, LPVOID lpTlsValue); WINPR_API BOOL TlsSetValue(DWORD dwTlsIndex, LPVOID lpTlsValue);
WINPR_API BOOL TlsFree(DWORD dwTlsIndex); WINPR_API BOOL TlsFree(DWORD dwTlsIndex);