[5.2] d9f0a3e Spell __FreeBSD_version correctly

PÃ¥l Hermunn Johansen hermunn at varnish-software.com
Fri Sep 15 11:17:12 UTC 2017


commit d9f0a3ebe1ef543adf418916a3a1c84ac0cff85a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Sep 7 10:12:37 2017 +0000

    Spell __FreeBSD_version correctly

diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index d6c8921..3624c28 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -191,7 +191,7 @@ static struct cli_proto debug_cmds[] = {
  * XXX: Think more about which order we start things
  */
 
-#if defined(__FreeBSD__) && __FreeBSD__version >= 1000000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 1000000
 static void
 child_malloc_fail(void *p, const char *s)
 {
@@ -208,7 +208,7 @@ child_main(void)
 	setbuf(stdout, NULL);
 	setbuf(stderr, NULL);
 	printf("Child starts\n");
-#if defined(__FreeBSD__) && __FreeBSD__version >= 1000000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 1000000
 	malloc_message = child_malloc_fail;
 #endif
 


More information about the varnish-commit mailing list