From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 4 Jun 2005 20:39:15 +0000 (+0000)
Subject: (gettimeofday): Use struct _timeb, not struct timeb.
X-Git-Tag: emacs-pretest-22.0.90~9306
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6e60256665d21eab02d22b9488d68cfc751f8eec;p=emacs.git

(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 cdc41a8c772..8707732fd6c 100644
--- 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;