mongrel2 1.10.0

Closes Homebrew/homebrew#45261.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Justin Karneges 2015-10-22 22:14:55 -07:00 committed by Mike McQuaid
parent 57f70e9cd3
commit 8db31d3f22

View file

@ -1,8 +1,8 @@
class Mongrel2 < Formula
desc "Application, language, and network architecture agnostic web server"
homepage "http://mongrel2.org/"
url "https://github.com/mongrel2/mongrel2/releases/download/v1.9.3/mongrel2-v1.9.3.tar.bz2"
sha256 "40ee0e804053f812cc36906464289ea656a4fc53b4a82d49796cafbe37f97425"
url "https://github.com/mongrel2/mongrel2/releases/download/v1.10.0/mongrel2-v1.10.0.tar.bz2"
sha256 "f0ccca380a9725fd406a793d8f84f9c29876fe43cf06fc509b3296b5c16ba0aa"
head "https://github.com/mongrel2/mongrel2.git", :branch => "develop"
@ -16,10 +16,6 @@ class Mongrel2 < Formula
depends_on "zeromq"
# Fix #43925 by backporting fix to 1.9.3. Remove when 1.9.4 comes out.
# https://github.com/mongrel2/mongrel2/pull/274
patch :DATA
def install
# Build in serial. See:
# https://github.com/Homebrew/homebrew/issues/8719
@ -37,30 +33,3 @@ class Mongrel2 < Formula
system bin/"m2sh", "help"
end
end
__END__
diff --git a/src/mem/align.h b/src/mem/align.h
index 4c6e183..03a4999 100644
--- a/src/mem/align.h
+++ b/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
diff --git a/src/mem/halloc.c b/src/mem/halloc.c
index b097d1f..40d0c09 100644
--- a/src/mem/halloc.c
+++ b/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;