(gettimeofday): Use struct _timeb, not struct timeb.

(open_unc_volume): Cast return value of map_w32_filename, to avoid
compiler warnings.

diff --git a/src/w32.c b/src/w32.c
index cdc41a8c7723cacc93b95e239d9801c03fc17b2e..8707732fd6c9bb28001249f43df4bfe5da91d6e0 100644 (file)
--- a/src/w32.c
+++ b/src/w32.c
@@ -1273,7 +1273,7 @@ get_emacs_configuration_options (void)
 void
 gettimeofday (struct timeval *tv, struct timezone *tz)
 {
-  struct timeb tb;
+  struct _timeb tb;
   _ftime (&tb);
 
   tv->tv_sec = tb.time;
@@ -1777,7 +1777,7 @@ open_unc_volume (const char *path)
   nr.dwDisplayType = RESOURCEDISPLAYTYPE_SERVER;
   nr.dwUsage = RESOURCEUSAGE_CONTAINER;
   nr.lpLocalName = NULL;
-  nr.lpRemoteName = map_w32_filename (path, NULL);
+  nr.lpRemoteName = (LPSTR)map_w32_filename (path, NULL);
   nr.lpComment = NULL;
   nr.lpProvider = NULL;