summaryrefslogtreecommitdiff
path: root/include/violite.h
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2012-08-30 11:36:24 +0200
committerVladislav Vaintroub <wlad@montyprogram.com>2012-08-30 11:36:24 +0200
commitae325ec6ce3998b3dd38fc2ad7763857cd4c140f (patch)
tree957911b8185c51f0ad2caf43f2124552bca6db9f /include/violite.h
parentd99b8004e6b46e2a1b321bf50825254bf841cddb (diff)
downloadmariadb-git-ae325ec6ce3998b3dd38fc2ad7763857cd4c140f.tar.gz
Compile 10.0 on Windows
Diffstat (limited to 'include/violite.h')
-rw-r--r--include/violite.h13
1 files changed, 8 insertions, 5 deletions
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_ */