- Fix build with GCC 5

PR:		197624
Submitted by:	marino
This commit is contained in:
Ashish SHUKLA 2015-02-15 14:12:19 +00:00
parent 0affa18976
commit 611b9a7a82
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=379037

View file

@ -0,0 +1,31 @@
$FreeBSD$
Fix build on modern gcc which defines max_align_t for C11
It renames the locale definition to avoid the name clash.
--- nestegg/halloc/src/align.h.orig
+++ nestegg/halloc/src/align.h
@@ -30,7 +30,7 @@
void (*q)(void);
};
-typedef union max_align max_align_t;
+typedef union max_align halloc_max_align_t;
#endif
$FreeBSD$
--- nestegg/halloc/src/halloc.c.orig
+++ nestegg/halloc/src/halloc.c
@@ -30,7 +30,7 @@
#endif
hlist_item_t siblings; /* 2 pointers */
hlist_head_t children; /* 1 pointer */
- max_align_t data[1]; /* not allocated, see below */
+ halloc_max_align_t data[1]; /* not allocated, see below */
} hblock_t;