From 255eb07d317706a017e3a83a1d70c9ebf746b1d6 Mon Sep 17 00:00:00 2001 From: beerpsi Date: Sun, 31 Dec 2023 14:41:41 +0700 Subject: [PATCH] fix compilation error caused by conflicting names --- chuniio/src/servers/android.c | 4 ++-- chuniio/src/servers/android.h | 2 +- chuniio/src/servers/ios.c | 4 ++-- chuniio/src/servers/ios.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chuniio/src/servers/android.c b/chuniio/src/servers/android.c index bc569d9..3f526c7 100644 --- a/chuniio/src/servers/android.c +++ b/chuniio/src/servers/android.c @@ -270,9 +270,9 @@ unsigned int __stdcall input_recv_thread_proc(void *v) { } } - if (packet_len >= sizeof(struct PacketInput) && + if (packet_len >= sizeof(struct AndroidPacketInput) && memcmp(buffer + 1, "INP", 3) == 0) { - const struct PacketInput *pkt = (struct PacketInput *)buffer; + const struct AndroidPacketInput *pkt = (struct AndroidPacketInput *)buffer; memcpy(memory->airIoStatus, pkt->airIoStatus, sizeof(pkt->airIoStatus)); memcpy(memory->sliderIoStatus, pkt->sliderIoStatus, diff --git a/chuniio/src/servers/android.h b/chuniio/src/servers/android.h index 6c6fd23..5ff1931 100644 --- a/chuniio/src/servers/android.h +++ b/chuniio/src/servers/android.h @@ -13,7 +13,7 @@ ; #pragma pack(push) #pragma pack(1) -struct PacketInput { +struct AndroidPacketInput { uint8_t packetSize; uint8_t packetName[3]; uint32_t packetId; diff --git a/chuniio/src/servers/ios.c b/chuniio/src/servers/ios.c index 6b0e173..1b60b2d 100644 --- a/chuniio/src/servers/ios.c +++ b/chuniio/src/servers/ios.c @@ -102,8 +102,8 @@ unsigned int __stdcall ios_input_recv_thread_proc(void *v) { break; } - if (len >= sizeof(struct PacketInput) && memcmp(buffer + 1, "INP", 3) == 0) { - struct PacketInput *pkt = (struct PacketInput *)buffer; + if (len >= sizeof(struct iOSPacketInput) && memcmp(buffer + 1, "INP", 3) == 0) { + struct iOSPacketInput *pkt = (struct iOSPacketInput *)buffer; if (air_enabled) { memcpy(ctx->memory->airIoStatus, pkt->airIoStatus, diff --git a/chuniio/src/servers/ios.h b/chuniio/src/servers/ios.h index dffb445..d201633 100644 --- a/chuniio/src/servers/ios.h +++ b/chuniio/src/servers/ios.h @@ -13,7 +13,7 @@ ; #pragma pack(push) #pragma pack(1) -struct PacketInput { +struct iOSPacketInput { uint8_t packetSize; uint8_t packetName[3]; uint8_t airIoStatus[6];