winpr: fix build warnings

This commit is contained in:
Marc-André Moreau 2014-11-11 11:21:34 -05:00
parent a48ed7239d
commit 68ee5df7d9
3 changed files with 9 additions and 8 deletions

View File

@ -1518,7 +1518,7 @@ static void update_send_pointer_position(rdpContext* context, POINTER_POSITION_U
Stream_Write_UINT16(s, pointerPosition->xPos); /* xPos (2 bytes) */ Stream_Write_UINT16(s, pointerPosition->xPos); /* xPos (2 bytes) */
Stream_Write_UINT16(s, pointerPosition->yPos); /* yPos (2 bytes) */ Stream_Write_UINT16(s, pointerPosition->yPos); /* yPos (2 bytes) */
fastpath_send_update_pdu(rdp->fastpath, FASTPATH_UPDATETYPE_PTR_POSITION, s); fastpath_send_update_pdu(rdp->fastpath, FASTPATH_UPDATETYPE_PTR_POSITION, s, FALSE);
Stream_Release(s); Stream_Release(s);
} }

View File

@ -181,9 +181,6 @@ VOID CloseThreadpool(PTP_POOL ptpp)
if (pCloseThreadpool) if (pCloseThreadpool)
pCloseThreadpool(ptpp); pCloseThreadpool(ptpp);
#else #else
int index;
HANDLE thread;
SetEvent(ptpp->TerminateEvent); SetEvent(ptpp->TerminateEvent);
ArrayList_Free(ptpp->Threads); ArrayList_Free(ptpp->Threads);

View File

@ -267,7 +267,7 @@ exit:
if (thread->detached || !thread->started) if (thread->detached || !thread->started)
cleanup_handle(thread); cleanup_handle(thread);
pthread_exit(thread->dwExitCode); pthread_exit((void*) (size_t) thread->dwExitCode);
return rc; return rc;
} }
@ -426,12 +426,13 @@ VOID ExitThread(DWORD dwExitCode)
{ {
pthread_t tid = pthread_self(); pthread_t tid = pthread_self();
if (NULL == thread_list) if (!thread_list)
{ {
WLog_ERR(TAG, "function called without existing thread list!"); WLog_ERR(TAG, "function called without existing thread list!");
#if defined(WITH_DEBUG_THREADS) #if defined(WITH_DEBUG_THREADS)
DumpThreadHandles(); DumpThreadHandles();
#endif #endif
pthread_exit(0);
} }
else if (!ListDictionary_Contains(thread_list, &tid)) else if (!ListDictionary_Contains(thread_list, &tid))
{ {
@ -439,12 +440,15 @@ VOID ExitThread(DWORD dwExitCode)
#if defined(WITH_DEBUG_THREADS) #if defined(WITH_DEBUG_THREADS)
DumpThreadHandles(); DumpThreadHandles();
#endif #endif
pthread_exit(0);
} }
else else
{ {
WINPR_THREAD *thread; WINPR_THREAD* thread;
ListDictionary_Lock(thread_list); ListDictionary_Lock(thread_list);
thread = ListDictionary_GetItemValue(thread_list, &tid); thread = ListDictionary_GetItemValue(thread_list, &tid);
assert(thread); assert(thread);
thread->exited = TRUE; thread->exited = TRUE;
thread->dwExitCode = dwExitCode; thread->dwExitCode = dwExitCode;
@ -457,7 +461,7 @@ VOID ExitThread(DWORD dwExitCode)
if (thread->detached || !thread->started) if (thread->detached || !thread->started)
cleanup_handle(thread); cleanup_handle(thread);
pthread_exit(thread->dwExitCode); pthread_exit((void*) (size_t) thread->dwExitCode);
} }
} }