[PATCH 0/1] MR6643: dlls/bluetoothapis/test: Redefine SDP type descriptor constants to compile with older GCC versions.

[Vibhav Pant (＠vibhavp)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57277

[PATCH 1/1] dlls/bluetoothapis/test: Redefine SDP type descriptor constants to compile with older GCC versions.

[Vibhav Pant]

From: Vibhav Pant

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57277
---
 dlls/bluetoothapis/tests/sdp.c | 47 +++++++++++++---------------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/dlls/bluetoothapis/tests/sdp.c b/dlls/bluetoothapis/tests/sdp.c
index f5ad6334d7c..11ef69adbf8 100644
--- a/dlls/bluetoothapis/tests/sdp.c
+++ b/dlls/bluetoothapis/tests/sdp.c
@@ -96,35 +96,24 @@ static void test_BluetoothSdpGetElementData_nil( void )
     }
 }

-#define SDP_SIZE_DESC_1_BYTE 0
-#define SDP_SIZE_DESC_2_BYTES 1
-#define SDP_SIZE_DESC_4_BYTES 2
-#define SDP_SIZE_DESC_8_BYTES 3
-#define SDP_SIZE_DESC_16_BYTES 4
-#define SDP_SIZE_DESC_NEXT_UINT8 5
-#define SDP_SIZE_DESC_NEXT_UINT16 6
-#define SDP_SIZE_DESC_NEXT_UINT32 7
-
-#define SDP_DATA_ELEM_TYPE_DESC(t,s) ((t) << 3 | SDP_SIZE_DESC_##s)
-
-#define SDP_DEF_TYPE(n, t, s) const static BYTE SDP_TYPE_DESC_##n = SDP_DATA_ELEM_TYPE_DESC(SDP_TYPE_##t, s)
-#define SDP_DEF_INTEGRAL( w, s )                                                                   \
-    SDP_DEF_TYPE( INT##w, INT, s );                                                                \
-    SDP_DEF_TYPE( UINT##w, UINT, s);
-
-SDP_DEF_INTEGRAL( 8, 1_BYTE );
-SDP_DEF_INTEGRAL( 16, 2_BYTES );
-SDP_DEF_INTEGRAL( 32, 4_BYTES );
-SDP_DEF_INTEGRAL( 64, 8_BYTES );
-SDP_DEF_INTEGRAL( 128, 16_BYTES );
-
-SDP_DEF_TYPE( STR8, STRING, NEXT_UINT8 );
-SDP_DEF_TYPE( STR16, STRING, NEXT_UINT16 );
-SDP_DEF_TYPE( STR32, STRING, NEXT_UINT32 );
-
-SDP_DEF_TYPE( SEQ8, SEQUENCE, NEXT_UINT8 );
-SDP_DEF_TYPE( SEQ16, SEQUENCE, NEXT_UINT16 );
-SDP_DEF_TYPE( SEQ32, SEQUENCE, NEXT_UINT32 );
+#define SDP_TYPE_DESC_INT8    (0x10)
+#define SDP_TYPE_DESC_UINT8   (0x8)
+#define SDP_TYPE_DESC_INT16   (0x11)
+#define SDP_TYPE_DESC_UINT16  (0x9)
+#define SDP_TYPE_DESC_INT32   (0x12)
+#define SDP_TYPE_DESC_UINT32  (0xa)
+#define SDP_TYPE_DESC_INT64   (0x13)
+#define SDP_TYPE_DESC_UINT64  (0xb)
+#define SDP_TYPE_DESC_INT128  (0x14)
+#define SDP_TYPE_DESC_UINT128 (0xc)
+
+#define SDP_TYPE_DESC_STR8  (0x25)
+#define SDP_TYPE_DESC_STR16 (0x26)
+#define SDP_TYPE_DESC_STR32 (0x27)
+
+#define SDP_TYPE_DESC_SEQ8  (0x35)
+#define SDP_TYPE_DESC_SEQ16 (0x36)
+#define SDP_TYPE_DESC_SEQ32 (0x37)

static void test_BluetoothSdpGetElementData_ints( void )
 {

[Rémi Bernon (＠rbernon)]

Rémi Bernon (@rbernon) commented about dlls/bluetoothapis/tests/sdp.c:
> +#define SDP_TYPE_DESC_INT64   (0x13)
> +#define SDP_TYPE_DESC_UINT64  (0xb)
> +#define SDP_TYPE_DESC_INT128  (0x14)
> +#define SDP_TYPE_DESC_UINT128 (0xc)
> -
>
> +#define SDP_TYPE_DESC_STR8  (0x25)
> +#define SDP_TYPE_DESC_STR16 (0x26)
> +#define SDP_TYPE_DESC_STR32 (0x27)
> -
>
> +#define SDP_TYPE_DESC_SEQ8  (0x35)
> +#define SDP_TYPE_DESC_SEQ16 (0x36)
> +#define SDP_TYPE_DESC_SEQ32 (0x37)
>
> static void test_BluetoothSdpGetElementData_ints( void )
>  {
>      static struct

You could probably just remove the static here and below I believe (would allow to keep the definitions in sync with the other locations they are defined).