summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorMilind Changire <mchangir@redhat.com>2015-11-05 20:08:33 +0530
committerNiels de Vos <ndevos@redhat.com>2015-11-20 03:25:29 -0800
commit21c7debd3fc2613e10d7ee81543dbd65b2b897fa (patch)
treee7a70a62f3439d75d9b0c26fb89619ddf55341b1 /contrib
parent3748b6540d7704116cbbef08b7401bdc997464cd (diff)
build: fix ecdh.h and dh.h deps
openssl/ecdh.h and openssl/dh.h are not available on all platforms, especially rhel-5. This patch adds check to autoconf and updates relevant source files. Added conditional to test for SSL_OP_NO_TICKET and SSL_OP_NO_COMPRESSION presence before setting the SSL context options. Macros UTIME_OMIT and UTIME_NOW picked up from Fedora 22 /usr/include/bits/stat.h to help rhel-5 build. Change-Id: I2bdee4fe643f9c1f5fe77cf89bd30946cd6b591a Reviewed-on: http://review.gluster.org/#/c/12517/ BUG: 1258594 Signed-off-by: Milind Changire <mchangir@redhat.com> Reviewed-on: http://review.gluster.org/12518 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/qemu/util/oslib-posix.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/contrib/qemu/util/oslib-posix.c b/contrib/qemu/util/oslib-posix.c
index bac4c1a..0f0f973 100644
--- a/contrib/qemu/util/oslib-posix.c
+++ b/contrib/qemu/util/oslib-posix.c
@@ -191,6 +191,14 @@ int qemu_pipe(int pipefd[2])
return ret;
}
+#ifndef UTIME_NOW
+#define UTIME_NOW ((1l << 30) - 1l)
+#endif
+#ifndef UTIME_OMIT
+#define UTIME_OMIT ((1l << 30) - 2l)
+#endif
+
+
int qemu_utimens(const char *path, const struct timespec *times)
{
struct timeval tv[2], tv_now;