aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/w32.c')
-rw-r--r--src/w32.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/w32.c b/src/w32.c
index cdc41a8c772..1bb4a91ff03 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -1273,7 +1273,7 @@ get_emacs_configuration_options (void)
1273void 1273void
1274gettimeofday (struct timeval *tv, struct timezone *tz) 1274gettimeofday (struct timeval *tv, struct timezone *tz)
1275{ 1275{
1276 struct timeb tb; 1276 struct _timeb tb;
1277 _ftime (&tb); 1277 _ftime (&tb);
1278 1278
1279 tv->tv_sec = tb.time; 1279 tv->tv_sec = tb.time;
@@ -1777,7 +1777,7 @@ open_unc_volume (const char *path)
1777 nr.dwDisplayType = RESOURCEDISPLAYTYPE_SERVER; 1777 nr.dwDisplayType = RESOURCEDISPLAYTYPE_SERVER;
1778 nr.dwUsage = RESOURCEUSAGE_CONTAINER; 1778 nr.dwUsage = RESOURCEUSAGE_CONTAINER;
1779 nr.lpLocalName = NULL; 1779 nr.lpLocalName = NULL;
1780 nr.lpRemoteName = map_w32_filename (path, NULL); 1780 nr.lpRemoteName = (LPSTR)map_w32_filename (path, NULL);
1781 nr.lpComment = NULL; 1781 nr.lpComment = NULL;
1782 nr.lpProvider = NULL; 1782 nr.lpProvider = NULL;
1783 1783
@@ -3207,7 +3207,7 @@ sys_shutdown (int s, int how)
3207} 3207}
3208 3208
3209int 3209int
3210sys_setsockopt (int s, int level, int optname, const char * optval, int optlen) 3210sys_setsockopt (int s, int level, int optname, const void * optval, int optlen)
3211{ 3211{
3212 if (winsock_lib == NULL) 3212 if (winsock_lib == NULL)
3213 { 3213 {
@@ -3219,7 +3219,7 @@ sys_setsockopt (int s, int level, int optname, const char * optval, int optlen)
3219 if (fd_info[s].flags & FILE_SOCKET) 3219 if (fd_info[s].flags & FILE_SOCKET)
3220 { 3220 {
3221 int rc = pfn_setsockopt (SOCK_HANDLE (s), level, optname, 3221 int rc = pfn_setsockopt (SOCK_HANDLE (s), level, optname,
3222 optval, optlen); 3222 (const char *)optval, optlen);
3223 if (rc == SOCKET_ERROR) 3223 if (rc == SOCKET_ERROR)
3224 set_errno (); 3224 set_errno ();
3225 return rc; 3225 return rc;