head 1.3; access; symbols pkgsrc-2019Q4:1.2.0.60 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.56 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.54 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.52 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.50 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.48 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.46 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.44 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.42 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.40 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.36 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.34 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.32 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.30 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.28 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.26 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.24 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.22 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.20 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.18 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.16 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.14 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.12 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.10 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.8 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.6 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.4 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.2 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.1.0.58 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.56 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.54 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.52 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.50 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.48 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.46 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.44 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.42 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.40 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.38 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.36 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.34 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.32 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.30 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.28 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.26 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.24 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.22 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.20 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.18 pkgsrc-2008Q1:1.1.0.16 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.14 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.12 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.10 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.8 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.6 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.4 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.2 pkgsrc-2006Q2-base:1.1; locks; strict; comment @# @; 1.3 date 2020.01.29.10.33.17; author nia; state dead; branches; next 1.2; commitid NaWbZoXZ0LF0BzUB; 1.2 date 2013.03.02.18.13.14; author joerg; state Exp; branches; next 1.1; 1.1 date 2006.06.26.10.56.57; author rillig; state Exp; branches; next ; desc @@ 1.3 log @gcube: Remove, succeeded by emulators/dolphin-emu @ text @$NetBSD: patch-ag,v 1.2 2013/03/02 18:13:14 joerg Exp $ Thou shalt not use reserved identifiers. --- tplx.c.orig 2004-12-27 15:57:42.000000000 +0000 +++ tplx.c @@@@ -37,13 +37,13 @@@@ # define BSWAP_16(B)\ ({\ - __u16 _B = (B);\ - (((__u16) ((_B) << 8) | ((_B) >> 8)));\ + __u16 m_B = (B);\ + (((__u16) ((m_B) << 8) | ((m_B) >> 8)));\ }) # define BSWAP_32(B)\ ({\ - __u32 _B = (B);\ - (((__u32) (_B << 24) | ((_B << 8) & 0xff0000) | ((_B >> 8) & 0xff00) | (_B >> 24)));\ + __u32 m_B = (B);\ + (((__u32) (m_B << 24) | ((m_B << 8) & 0xff0000) | ((m_B >> 8) & 0xff00) | (m_B >> 24)));\ }) #ifdef LIL_ENDIAN @@@@ -103,21 +103,17 @@@@ typedef struct __u32 offset; } TPLPaletteHeader; - -#define TPLHeader(n) \ - struct\ - {\ - __u32 magic;\ - __u32 ntextures;\ - __u32 texture_size;\ - TPLTexture textures[n];\ - }\ - +struct tplheader { + __u32 magic; + __u32 ntextures; + __u32 texture_size; + TPLTexture textures[]; +}; __u8 texbuff[1024*1024*4]; -inline __u32 color_unpack_rgb565 (__u32 X) +__u32 color_unpack_rgb565 (__u32 X) { #ifdef LIL_ENDIAN return (((X & 0xf800) >> 8) | ((X & 0xe000) >> 13) | @@@@ -133,21 +129,21 @@@@ inline __u32 color_unpack_rgb565 (__u32 } -inline __u32 color_unpack_rgba4 (__u32 X) +__u32 color_unpack_rgba4 (__u32 X) { - __u32 _X = X; + __u32 m_X = X; #ifdef LIL_ENDIAN - _X = ((X & 0x0f00) << 0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12); + m_X = ((X & 0x0f00) << 0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12); #else - _X = ((X & 0x0f00) << 8) | ((X & 0x00f0) << 4) | ((X & 0x000f) << 0) | ((X & 0xf000) << 12); + m_X = ((X & 0x0f00) << 8) | ((X & 0x00f0) << 4) | ((X & 0x000f) << 0) | ((X & 0xf000) << 12); #endif - return (_X | (_X << 4)); + return (m_X | (m_X << 4)); } -inline __u32 color_unpack_rgba6 (__u32 X) +__u32 color_unpack_rgba6 (__u32 X) { #ifdef LIL_ENDIAN return ((X & 0xfc0000) >> 16) | ((X & 0xc00000) >> 22) | @@@@ -163,7 +159,7 @@@@ inline __u32 color_unpack_rgba6 (__u32 X } // RGB5 1rrr rrgg gggb bbbb -inline __u32 color_unpack_rgb555 (__u32 X) +__u32 color_unpack_rgb555 (__u32 X) { #ifdef LIL_ENDIAN return ((X & 0x7c00) >> 7) | ((X & 0x7000) >> 12) | @@@@ -178,7 +174,7 @@@@ inline __u32 color_unpack_rgb555 (__u32 // RGB4A3 0aaa rrrr gggg bbbb -inline __u32 color_unpack_rgb4a3 (__u32 X) +__u32 color_unpack_rgb4a3 (__u32 X) { #ifdef LIL_ENDIAN return ((X & 0x0f00) >> 4) | ((X & 0x0f00) >> 8) | @@@@ -194,7 +190,7 @@@@ inline __u32 color_unpack_rgb4a3 (__u32 } -inline __u32 color_unpack_rgb5a3 (__u32 X) +__u32 color_unpack_rgb5a3 (__u32 X) { if (X & 0x8000) return (color_unpack_rgb555 (X) | MASK_ALPHA); @@@@ -203,7 +199,7 @@@@ inline __u32 color_unpack_rgb5a3 (__u32 } -inline __u32 color_unpack_i4 (__u32 X) +__u32 color_unpack_i4 (__u32 X) { X |= X << 4; X |= X << 8; @@@@ -211,14 +207,14 @@@@ inline __u32 color_unpack_i4 (__u32 X) } -inline __u32 color_unpack_i8 (__u32 X) +__u32 color_unpack_i8 (__u32 X) { X |= X << 8; return (X | (X << 16)); } -inline __u32 color_unpack_ia4 (__u32 X) +__u32 color_unpack_ia4 (__u32 X) { __u32 a = X & 0xf0; @@@@ -234,7 +230,7 @@@@ inline __u32 color_unpack_ia4 (__u32 X) } -inline __u32 color_unpack_ia8 (__u32 X) +__u32 color_unpack_ia8 (__u32 X) { __u32 a = X & 0xff00; @@@@ -826,7 +822,7 @@@@ int extract_textures (char *buff) { char temp[256]; int i; - TPLHeader (1) *hdr = (void *)buff; + struct tplheader *hdr = (void *)buff; if (BSWAP32 (hdr->magic) != TPL_MAGIC) @@@@ -839,7 +835,7 @@@@ int extract_textures (char *buff) { int n = BSWAP32 (((__u32 *)buff)[1]); // using variable length array - TPLHeader (n) *hdr = (void *) buff; + struct tplheader *hdr = (void *)buff; TPLTextureHeader *texhdr = (void *) &buff[BSWAP32 (hdr->textures[0].texture_header_offset)]; TPLPaletteHeader *palhdr; @ 1.2 log @Fix inline use. Avoid variable length types. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.1 2006/06/26 10:56:57 rillig Exp $ @ 1.1 log @Added four patches that replace reserved identifiers with allowed ones. Fixes the build on NetBSD, which also defines the same identifiers, but is allowed to. @ text @d1 1 a1 1 $NetBSD$ d5 2 a6 2 --- tplx.c.orig 2004-12-27 16:57:42.000000000 +0100 +++ tplx.c 2006-06-26 12:50:49.000000000 +0200 d25 20 a44 1 @@@@ -135,15 +135,15 @@@@ inline __u32 color_unpack_rgb565 (__u32 d46 14 a59 1 inline __u32 color_unpack_rgba4 (__u32 X) d77 85 @