diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_valgrind.h | 2 | ||||
| -rw-r--r-- | include/violite.h | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/my_valgrind.h b/include/my_valgrind.h index d32b1f78e15..49da89ab78c 100644 --- a/include/my_valgrind.h +++ b/include/my_valgrind.h @@ -39,7 +39,7 @@ #ifndef DBUG_OFF #define TRASH_FILL(A,B,C) do { const size_t trash_tmp= (B) ; bfill(A, trash_tmp, C); MEM_UNDEFINED(A, trash_tmp); } while (0) #else -#define TRASH_FILL(A,B,C) do{ const size_t trash_tmp __attribute((unused)) = (B) ; MEM_CHECK_ADDRESSABLE(A,trash_tmp);MEM_UNDEFINED(A,trash_tmp);} while (0) +#define TRASH_FILL(A,B,C) do{ const size_t trash_tmp __attribute__((unused)) = (B) ; MEM_CHECK_ADDRESSABLE(A,trash_tmp);MEM_UNDEFINED(A,trash_tmp);} while (0) #endif #define TRASH_ALLOC(A,B) TRASH_FILL(A,B,0xA5) #define TRASH_FREE(A,B) TRASH_FILL(A,B,0x8F) diff --git a/include/violite.h b/include/violite.h index 661d07d5a3b..9d82bda67c3 100644 --- a/include/violite.h +++ b/include/violite.h @@ -263,11 +263,6 @@ struct st_vio my_bool (*has_data) (Vio*); int (*io_wait)(Vio*, enum enum_vio_io_event, int); my_bool (*connect)(Vio*, struct sockaddr *, socklen_t, int); -#ifdef _WIN32 - HANDLE hPipe; - DWORD thread_id; /* Used on XP only by vio_shutdown() */ - OVERLAPPED overlapped; -#endif #ifdef HAVE_OPENSSL void *ssl_arg; #endif @@ -282,5 +277,13 @@ struct st_vio size_t shared_memory_remain; char *shared_memory_pos; #endif /* HAVE_SMEM */ +#ifdef _WIN32 + HANDLE hPipe; + OVERLAPPED overlapped; + DWORD thread_id; /* Used on XP only by vio_shutdown() */ + OVERLAPPED pipe_overlapped; + DWORD read_timeout_ms; + DWORD write_timeout_ms; +#endif }; #endif /* vio_violite_h_ */ |