Date: Mon, 31 Oct 2016 10:26:27 +0000 (UTC) From: Veniamin Gvozdikov <vg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424994 - in head/www/mongrel2: . files Message-ID: <201610311026.u9VAQRgv035392@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vg Date: Mon Oct 31 10:26:27 2016 New Revision: 424994 URL: https://svnweb.freebsd.org/changeset/ports/424994 Log: - Fix conflict with max_align_t PR: ports/213657 Submitted by: jhb Added: head/www/mongrel2/files/patch-src_mem_align.h (contents, props changed) head/www/mongrel2/files/patch-src_mem_halloc.c (contents, props changed) Modified: head/www/mongrel2/Makefile Modified: head/www/mongrel2/Makefile ============================================================================== --- head/www/mongrel2/Makefile Mon Oct 31 10:02:48 2016 (r424993) +++ head/www/mongrel2/Makefile Mon Oct 31 10:26:27 2016 (r424994) @@ -3,7 +3,7 @@ PORTNAME= mongrel2 PORTVERSION= 1.7.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://mongrel2.org/static/downloads/ Added: head/www/mongrel2/files/patch-src_mem_align.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mongrel2/files/patch-src_mem_align.h Mon Oct 31 10:26:27 2016 (r424994) @@ -0,0 +1,11 @@ +--- src/mem/align.h.orig 2016-10-31 10:10:23 UTC ++++ src/mem/align.h +@@ -30,7 +30,7 @@ union max_align + void (*q)(void); + }; + +-typedef union max_align max_align_t; ++typedef union max_align h_max_align_t; + + #endif + Added: head/www/mongrel2/files/patch-src_mem_halloc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mongrel2/files/patch-src_mem_halloc.c Mon Oct 31 10:26:27 2016 (r424994) @@ -0,0 +1,11 @@ +--- src/mem/halloc.c.orig 2016-10-31 10:10:30 UTC ++++ src/mem/halloc.c +@@ -34,7 +34,7 @@ typedef struct hblock + #endif + hlist_item_t siblings; /* 2 pointers */ + hlist_head_t children; /* 1 pointer */ +- max_align_t data[1]; /* not allocated, see below */ ++ h_max_align_t data[1]; /* not allocated, see below */ + + } hblock_t; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610311026.u9VAQRgv035392>