package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch

   1 From 8d0bc79f38913b1a55e7d151b32bbc9462c24b47 Mon Sep 17 00:00:00 2001
   2 From: Jason Miller <jason@jasom.org>
   3 Date: Fri, 14 Aug 2015 19:03:09 -0700
   4 Subject: [PATCH] Rename symbol to prevent conflict
   5
   6 One of the standard headers defines max_align_t on some versions of linux.
   7
   8 [Backported from upstream commit
   9 https://github.com/mongrel2/mongrel2/commit/563bac8c59b9b32205164d237cf1ec0cb48d189f.]
  10
  11 Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
  12 ---
  13  src/mem/align.h  | 2 +-
  14  src/mem/halloc.c | 2 +-
  15  2 files changed, 2 insertions(+), 2 deletions(-)
  16
  17 diff --git a/src/mem/align.h b/src/mem/align.h
  18 index 4c6e183..03a4999 100644
  19 --- a/src/mem/align.h
  20 +++ b/src/mem/align.h
  21 @@ -30,7 +30,7 @@ union max_align
  22         void (*q)(void);
  23  };
  24
  25 -typedef union max_align max_align_t;
  26 +typedef union max_align h_max_align_t;
  27
  28  #endif
  29
  30 diff --git a/src/mem/halloc.c b/src/mem/halloc.c
  31 index b097d1f..40d0c09 100644
  32 --- a/src/mem/halloc.c
  33 +++ b/src/mem/halloc.c
  34 @@ -34,7 +34,7 @@ typedef struct hblock
  35  #endif
  36         hlist_item_t  siblings; /* 2 pointers */
  37         hlist_head_t  children; /* 1 pointer  */
  38 -       max_align_t   data[1];  /* not allocated, see below */
  39 +       h_max_align_t   data[1];  /* not allocated, see below */
  40
  41  } hblock_t;
  42
  43 --
  44 2.1.4
  45