summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsnappy.mirrorbot@gmail.com <snappy.mirrorbot@gmail.com@03e5f5b5-db94-4691-08a0-1a8bf15f6143>2012-07-31 11:44:44 +0000
committersnappy.mirrorbot@gmail.com <snappy.mirrorbot@gmail.com@03e5f5b5-db94-4691-08a0-1a8bf15f6143>2012-07-31 11:44:44 +0000
commit2e225ba821b420ae28e1d427075d5589c1e892d9 (patch)
tree1e2a64b0a2a6da46055b878e4eef98712d680161
parente89f20ab46ee11050760c6d57f05c2a3825a911c (diff)
downloadsnappy-git-2e225ba821b420ae28e1d427075d5589c1e892d9.tar.gz
Fix public issue 64: Check for <sys/time.h> at configure time,
since MSVC seemingly does not have it. R=sanjay git-svn-id: https://snappy.googlecode.com/svn/trunk@66 03e5f5b5-db94-4691-08a0-1a8bf15f6143
-rw-r--r--configure.ac2
-rw-r--r--snappy-test.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index d193b0b..eb0bb0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_SUBST([LIBTOOL_DEPS])
AC_PROG_CXX
AC_LANG([C++])
AC_C_BIGENDIAN
-AC_CHECK_HEADERS([stdint.h stddef.h sys/mman.h sys/resource.h windows.h byteswap.h sys/byteswap.h sys/endian.h])
+AC_CHECK_HEADERS([stdint.h stddef.h sys/mman.h sys/resource.h windows.h byteswap.h sys/byteswap.h sys/endian.h sys/time.h])
# Don't use AC_FUNC_MMAP, as it checks for mappings of already-mapped memory,
# which we don't need (and does not exist on Windows).
diff --git a/snappy-test.h b/snappy-test.h
index 86a92fd..08b5cb7 100644
--- a/snappy-test.h
+++ b/snappy-test.h
@@ -47,7 +47,9 @@
#include <sys/resource.h>
#endif
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
+#endif
#ifdef HAVE_WINDOWS_H
#define WIN32_LEAN_AND_MEAN