summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGuillaume Friloux <guillaume.friloux@gmail.com>2015-01-30 11:03:00 +0100
committerCedric BAIL <cedric@osg.samsung.com>2015-02-11 17:03:37 +0100
commitf26977a1758dff88371206882daa2b63594c4368 (patch)
tree204c1128af9060810ea87e7bd9ff766f4fb95131 /src
parent0e8e4b2728a2a90a3f781e4b8f69e305b9e19b61 (diff)
ecore_con: use SOCKET and not int for socket descriptors on win32
Diffstat (limited to 'src')
-rw-r--r--src/lib/ecore_con/ecore_con_private.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/ecore_con/ecore_con_private.h b/src/lib/ecore_con/ecore_con_private.h
index 93942e2a6c..bed20ad97d 100644
--- a/src/lib/ecore_con/ecore_con_private.h
+++ b/src/lib/ecore_con/ecore_con_private.h
@@ -96,7 +96,11 @@ typedef enum Ecore_Con_Proxy_State
96 96
97struct _Ecore_Con_Client_Data 97struct _Ecore_Con_Client_Data
98{ 98{
99#ifdef _WIN32
100 SOCKET fd;
101#else
99 int fd; 102 int fd;
103#endif
100 Ecore_Con_Server *host_server; 104 Ecore_Con_Server *host_server;
101 void *data; 105 void *data;
102 Ecore_Fd_Handler *fd_handler; 106 Ecore_Fd_Handler *fd_handler;
@@ -126,7 +130,11 @@ typedef struct _Ecore_Con_Client_Data Ecore_Con_Client_Data;
126 130
127struct _Ecore_Con_Server_Data 131struct _Ecore_Con_Server_Data
128{ 132{
133#ifdef _WIN32
134 SOCKET fd;
135#else
129 int fd; 136 int fd;
137#endif
130 Ecore_Con_Type type; 138 Ecore_Con_Type type;
131 char *name; 139 char *name;
132 int port; 140 int port;