[master] 7574f96 Centralize the compat-defines of MAP_NOSYNC and MAP_HASSEMAPHORE

Poul-Henning Kamp phk at FreeBSD.org
Mon Aug 28 23:43:05 CEST 2017


commit 7574f961eb602de46207eca11c4b32da83f8c5b5
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 28 21:41:43 2017 +0000

    Centralize the compat-defines of MAP_NOSYNC and MAP_HASSEMAPHORE

diff --git a/include/vdef.h b/include/vdef.h
index 0995edf..5cde2f0 100644
--- a/include/vdef.h
+++ b/include/vdef.h
@@ -129,5 +129,12 @@
 #  define _Static_assert(a,b)
 #endif
 
+#ifndef MAP_HASSEMAPHORE
+#  define MAP_HASSEMAPHORE 0 /* XXX Linux */
+#endif
+
+#ifndef MAP_NOSYNC
+#  define MAP_NOSYNC 0 /* XXX Linux */
+#endif
 
 #endif /* VDEF_H_INCLUDED */
diff --git a/lib/libvarnish/vsmw.c b/lib/libvarnish/vsmw.c
index 3d1c095..4fba145 100644
--- a/lib/libvarnish/vsmw.c
+++ b/lib/libvarnish/vsmw.c
@@ -55,14 +55,6 @@
 #include "vfil.h"
 #include "vrnd.h"
 
-#ifndef MAP_HASSEMAPHORE
-#  define MAP_HASSEMAPHORE 0 /* XXX Linux */
-#endif
-
-#ifndef MAP_NOSYNC
-#  define MAP_NOSYNC 0 /* XXX Linux */
-#endif
-
 /*--------------------------------------------------------------------*/
 
 struct vsmwseg {
diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index 4c0e9ed..848fcf3 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -58,10 +58,6 @@
 
 #include "vapi/vsm.h"
 
-#ifndef MAP_HASSEMAPHORE
-#define MAP_HASSEMAPHORE 0 /* XXX Linux */
-#endif
-
 const struct vsm_valid VSM_invalid[1] = {{"invalid"}};
 const struct vsm_valid VSM_valid[1] = {{"valid"}};
 



More information about the varnish-commit mailing list