Commit 95132f83 authored by Nick Mathewson's avatar Nick Mathewson 🎨
Browse files

r8750@totoro: nickm | 2006-09-27 20:52:01 -0400

 Fix some warnings on mingw; hopefully this should let us build on mingw without warnings.


svn:r8509
parent ba7868c7
......@@ -403,7 +403,9 @@ AC_SYS_LARGEFILE
dnl The warning message here is no longer strictly accurate.
AC_CHECK_HEADERS(unistd.h string.h signal.h netdb.h ctype.h sys/stat.h sys/types.h fcntl.h sys/fcntl.h sys/ioctl.h sys/socket.h sys/time.h netinet/in.h arpa/inet.h errno.h assert.h time.h pwd.h grp.h, , AC_MSG_WARN(some headers were not found, compilation may fail))
AC_CHECK_HEADERS(unistd.h string.h signal.h ctype.h sys/stat.h sys/types.h fcntl.h sys/fcntl.h sys/time.h errno.h assert.h time.h, , AC_MSG_WARN(some headers were not found, compilation may fail))
AC_CHECK_HEADERS(netdb.h sys/ioctl.h sys/socket.h arpa/inet.h netinet/in.h pwd.h grp.h)
AC_CHECK_HEADERS(event.h, , AC_MSG_ERROR(Libevent header (event.h) not found. Tor requires libevent to build.),
[#ifdef HAVE_SYS_TYPES_H
......@@ -501,6 +503,7 @@ AC_CHECK_SIZEOF(long long)
AC_CHECK_SIZEOF(__int64)
AC_CHECK_SIZEOF(void *)
AC_CHECK_SIZEOF(time_t)
AC_CHECK_SIZEOF(size_t)
AC_CHECK_TYPES([uint, u_char])
......
......@@ -185,7 +185,11 @@ tor_mmap_file(const char *filename)
res->mmap_handle = CreateFileMapping(res->file_handle,
NULL,
PAGE_READONLY,
#if SIZEOF_SIZE_T > 4
(res->base.size >> 32),
#else
0,
#endif
(res->base.size & 0xfffffffful),
NULL);
if (res->mmap_handle != INVALID_HANDLE_VALUE)
......
......@@ -1036,6 +1036,7 @@ second_elapsed_callback(int fd, short event, void *args)
"Error from libevent when setting one-second timeout event");
}
#ifndef MS_WINDOWS
/** Called when a possibly ignorable libevent error occurs; ensures that we
* don't get into an infinite loop by ignoring too many errors from
* libevent. */
......@@ -1048,6 +1049,7 @@ got_libevent_error(void)
}
return 0;
}
#endif
/** Called when we get a SIGHUP: reload configuration files and keys,
* retry all connections, re-upload all descriptors, and so on. */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment