Browse Source

Z991239-351 #comment 解决winpr::handle编译出现的问题

gifur 5 years ago
parent
commit
84c704892f
3 changed files with 4 additions and 4 deletions
  1. 2 2
      spbase/sp_iom.c
  2. 0 2
      winpr/include/winpr/file.h
  3. 2 0
      winpr/libwinpr/handle/handle.h

+ 2 - 2
spbase/sp_iom.c

@@ -376,11 +376,11 @@ int sp_iom_run(sp_iom_t *iom)
 #ifdef _WIN32
 		InterlockedExchangeAdd((LONG*)&iom->stop, 0) == 0
 #else
-		/*the adapte func 'InterlockedExchangeAdd' implemented under winpr went wrong*/
+		/*the adapte func 'InterlockedExchangeAdd' implemented under winpr went wrong, maybe 64bit has responsibility*/
 		iom->stop == 0
 #endif //_WIN32
 		|| timer_queue_get_count(iom->tm_queue) > 0) 
-	{
+{
 		int rc = sp_iom_poll(iom, &timeout);
 		if (rc >= 0) {
 			if (timeout > POLL_INTERVAL || timeout < 0)

+ 0 - 2
winpr/include/winpr/file.h

@@ -34,8 +34,6 @@
 #define MAX_PATH 260
 #endif
 
-#define THREAD_CUR_ONE_HANDLE ((HANDLE)(LONG_PTR)-2)
-
 #define INVALID_HANDLE_VALUE ((HANDLE)(LONG_PTR)-1)
 #define INVALID_FILE_SIZE ((DWORD)0xFFFFFFFF)
 #define INVALID_SET_FILE_POINTER ((DWORD)-1)

+ 2 - 0
winpr/libwinpr/handle/handle.h

@@ -40,6 +40,8 @@
 #define HANDLE_TYPE_TIMER_QUEUE_TIMER 12
 #define HANDLE_TYPE_COMM 13
 
+#define THREAD_CUR_ONE_HANDLE ((HANDLE)(LONG_PTR)-2)
+
 #define WINPR_HANDLE_DEF() \
 	ULONG Type;            \
 	ULONG Mode;            \