games/woof: Fix build on SmartOS
[ 25%] Building C object src/CMakeFiles/woof.dir/hu_lib.c.o
/home/pbulk/build/games/woof/work/woof-woof_12.0.2/src/hu_lib.c:54:3: error: conflicting types for 'offset_t'; have 'enum <anonymous>'
54 | } offset_t;
| ^~~~~~~~
In file included from /usr/include/strings.h:32,
from /home/pbulk/build/games/woof/work/woof-woof_12.0.2/src/doomtype.h:60,
from /home/pbulk/build/games/woof/work/woof-woof_12.0.2/src/doomdata.h:26,
from /home/pbulk/build/games/woof/work/woof-woof_12.0.2/src/doomstat.h:30,
from /home/pbulk/build/games/woof/work/woof-woof_12.0.2/src/hu_lib.c:20:
/usr/include/sys/types.h:274:25: note: previous declaration of 'offset_t' with type 'offset_t' {aka 'long long int'}
274 | typedef longlong_t offset_t;
| ^~~~~~~~
*** [src/CMakeFiles/woof.dir/hu_lib.c.o] Error code 1
(micha)
diff -r1.41 -r1.42 pkgsrc/games/woof/distinfo| @@ -1,9 +1,10 @@ | @@ -1,9 +1,10 @@ | |||
| 1 | $NetBSD: distinfo,v 1.41 2024/01/17 14:40:51 micha Exp $ | 1 | $NetBSD: distinfo,v 1.42 2024/01/19 13:02:59 micha Exp $ | |
| 2 | 2 | |||
| 3 | BLAKE2s (woof_12.0.2.tar.gz) = 328dd35ec27edf6a71af458ed9f26723f99379827a5fc0bdac0c3c89d8ff163c | 3 | BLAKE2s (woof_12.0.2.tar.gz) = 328dd35ec27edf6a71af458ed9f26723f99379827a5fc0bdac0c3c89d8ff163c | |
| 4 | SHA512 (woof_12.0.2.tar.gz) = f7e2279028b2fb95e37f27e6ecbf988b525bdcc145bce33f201612279d5d5b2b20ff944b802e6d5a95b22281e5301963e4f4d95b50eef5eec39434fe9d71d38a | 4 | SHA512 (woof_12.0.2.tar.gz) = f7e2279028b2fb95e37f27e6ecbf988b525bdcc145bce33f201612279d5d5b2b20ff944b802e6d5a95b22281e5301963e4f4d95b50eef5eec39434fe9d71d38a | |
| 5 | Size (woof_12.0.2.tar.gz) = 7286364 bytes | 5 | Size (woof_12.0.2.tar.gz) = 7286364 bytes | |
| 6 | SHA1 (patch-data_CMakeLists.txt) = 33eaf12f559c868bb602b813832463ac08c25dd4 | 6 | SHA1 (patch-data_CMakeLists.txt) = 33eaf12f559c868bb602b813832463ac08c25dd4 | |
| 7 | SHA1 (patch-man_CMakeLists.txt) = d5b2b30eb8a7efeddad29699c47801bc1c865403 | 7 | SHA1 (patch-man_CMakeLists.txt) = d5b2b30eb8a7efeddad29699c47801bc1c865403 | |
| 8 | SHA1 (patch-man_WoofInstall.cmake.in) = fbbb75d201d53af8d68eeb29956d793eda465ffb | 8 | SHA1 (patch-man_WoofInstall.cmake.in) = fbbb75d201d53af8d68eeb29956d793eda465ffb | |
| 9 | SHA1 (patch-src_d__iwad.c) = 88e02974ce6a32be07ca035856c85ebdf97b3ab0 | 9 | SHA1 (patch-src_d__iwad.c) = 88e02974ce6a32be07ca035856c85ebdf97b3ab0 | |
| 10 | SHA1 (patch-src_hu__lib.c) = 00e566dcd879b6874a93f2482129e2cc85a29b83 |
$NetBSD: patch-src_hu__lib.c,v 1.1 2024/01/19 13:02:59 micha Exp $
Fix namespace clash on SmartOS.
Names with suffix "_t" are reserved for all POSIX headers:
<https://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_02_02>
(Woof indirectly includes "string.h")
--- src/hu_lib.c.orig 2023-12-13 09:45:57.000000000 +0000
+++ src/hu_lib.c
@@ -51,7 +51,7 @@ typedef enum {
offset_bottomright,
num_offsets,
-} offset_t;
+} woof_offset_type;
static int align_offset[num_offsets];