Merge pull request #5628 from akallabeth/handle_fix

Fix WINPR_EVENT and WINPR_TIMER structs.
This commit is contained in:
Martin Fleisz 2019-10-02 09:18:50 +02:00 committed by GitHub
commit 09191b7f1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -68,11 +68,11 @@ typedef struct winpr_semaphore WINPR_SEMAPHORE;
struct winpr_event struct winpr_event
{ {
WINPR_HANDLE_DEF(); WINPR_HANDLE_DEF();
char* name;
int pipe_fd[2]; int pipe_fd[2];
BOOL bAttached; BOOL bAttached;
BOOL bManualReset; BOOL bManualReset;
char* name;
}; };
typedef struct winpr_event WINPR_EVENT; typedef struct winpr_event WINPR_EVENT;
@ -97,7 +97,6 @@ struct winpr_timer
BOOL bManualReset; BOOL bManualReset;
PTIMERAPCROUTINE pfnCompletionRoutine; PTIMERAPCROUTINE pfnCompletionRoutine;
LPVOID lpArgToCompletionRoutine; LPVOID lpArgToCompletionRoutine;
char* name;
#ifdef WITH_POSIX_TIMER #ifdef WITH_POSIX_TIMER
timer_t tid; timer_t tid;
@ -109,6 +108,7 @@ struct winpr_timer
int pipe[2]; int pipe[2];
BOOL running; BOOL running;
#endif #endif
char* name;
}; };
typedef struct winpr_timer WINPR_TIMER; typedef struct winpr_timer WINPR_TIMER;