aboutsummaryrefslogtreecommitdiff
path: root/games/openbor/files
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2016-12-06 22:54:15 +0000
committerJan Beich <jbeich@FreeBSD.org>2016-12-06 22:54:15 +0000
commitca42533c8b92ab3b4693258d7ca4298d8eeaeb96 (patch)
tree6ab90eff1c9537f147aaa9cc45e6ee92b0c2eeed /games/openbor/files
parent5eee56ce729eeb3a6f1ee04cff078e16e2d6c473 (diff)
downloadports-ca42533c8b92ab3b4693258d7ca4298d8eeaeb96.tar.gz
ports-ca42533c8b92ab3b4693258d7ca4298d8eeaeb96.zip
games/openbor: update to 3.0.r4390
Notes
Notes: svn path=/head/; revision=428004
Diffstat (limited to 'games/openbor/files')
-rw-r--r--games/openbor/files/patch-source_webmlib_halloc39
1 files changed, 0 insertions, 39 deletions
diff --git a/games/openbor/files/patch-source_webmlib_halloc b/games/openbor/files/patch-source_webmlib_halloc
deleted file mode 100644
index 41b2971ddef8..000000000000
--- a/games/openbor/files/patch-source_webmlib_halloc
+++ /dev/null
@@ -1,39 +0,0 @@
-C11 defines different max_align_t in stddef.h. It may either come from
-compiler (GCC, Clang) or provided by the system (DragonFly, musl libc).
-FreeBSD's Clang has neither due to bug 193594.
-
-So, keep the old behavior by renaming the type here to avoid building
-with -ansi (upstream nestegg) or -std=gnu89 (SUSE).
-
- In file included from source/webmlib/halloc/halloc.c:19:0:
- source/webmlib/halloc/align.h:42:25: error: conflicting types for 'max_align_t'
- typedef union max_align max_align_t;
- ^
- In file included from source/webmlib/halloc/halloc.h:18:0,
- from source/webmlib/halloc/halloc.c:18:
- /usr/local/lib/gcc5/**/include/stddef.h:429:3: note: previous declaration of 'max_align_t' was here
- } max_align_t;
- ^
-
---- source/webmlib/halloc/align.h.orig 2015-04-09 22:13:36 UTC
-+++ source/webmlib/halloc/align.h
-@@ -39,7 +39,7 @@ union max_align
- void (*q)(void);
- };
-
--typedef union max_align max_align_t;
-+typedef union max_align halloc_max_align_t;
-
- #endif
-
---- source/webmlib/halloc/halloc.c.orig 2015-04-09 22:13:36 UTC
-+++ source/webmlib/halloc/halloc.c
-@@ -30,7 +30,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 */
-+ halloc_max_align_t data[1]; /* not allocated, see below */
-
- } hblock_t;
-