diff options
author | Eli Zaretskii <eliz@gnu.org> | 2005-06-04 20:39:15 +0000 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2005-06-04 20:39:15 +0000 |
commit | 6e60256665d21eab02d22b9488d68cfc751f8eec (patch) | |
tree | 6baece7afef29bc1da3f543a04116b4c5798e643 /src/w32.c | |
parent | cce55b8e955d0887b91ee077532388d891d41f10 (diff) | |
download | emacs-6e60256665d21eab02d22b9488d68cfc751f8eec.tar.gz |
(gettimeofday): Use struct _timeb, not struct timeb.
(open_unc_volume): Cast return value of map_w32_filename, to avoid
compiler warnings.
Diffstat (limited to 'src/w32.c')
-rw-r--r-- | src/w32.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |