From 678b38049eb9166661d66dcb90337f9067490249 Mon Sep 17 00:00:00 2001 From: dijunkun Date: Sat, 7 Oct 2023 14:43:33 +0800 Subject: [PATCH] Fix error caused by type 'long' has difference size in difference platforms --- .../remote_desk/remote_desk_client/remote_desk_client.cpp | 6 +++--- .../remote_desk/remote_desk_server/remote_desk_server.cpp | 6 +++--- src/transmission/ice_transmission.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/application/remote_desk/remote_desk_client/remote_desk_client.cpp b/application/remote_desk/remote_desk_client/remote_desk_client.cpp index 6eb6285..d54de25 100644 --- a/application/remote_desk/remote_desk_client/remote_desk_client.cpp +++ b/application/remote_desk/remote_desk_client/remote_desk_client.cpp @@ -51,13 +51,13 @@ typedef enum { mouse = 0, keyboard } ControlType; typedef enum { move = 0, left_down, left_up, right_down, right_up } MouseFlag; typedef enum { key_down = 0, key_up } KeyFlag; typedef struct { - long x; - long y; + size_t x; + size_t y; MouseFlag flag; } Mouse; typedef struct { - long key_value; + size_t key_value; KeyFlag flag; } Key; diff --git a/application/remote_desk/remote_desk_server/remote_desk_server.cpp b/application/remote_desk/remote_desk_server/remote_desk_server.cpp index 8dc8b9b..0095e54 100644 --- a/application/remote_desk/remote_desk_server/remote_desk_server.cpp +++ b/application/remote_desk/remote_desk_server/remote_desk_server.cpp @@ -28,13 +28,13 @@ typedef enum { mouse = 0, keyboard } ControlType; typedef enum { move = 0, left_down, left_up, right_down, right_up } MouseFlag; typedef enum { key_down = 0, key_up } KeyFlag; typedef struct { - long x; - long y; + size_t x; + size_t y; MouseFlag flag; } Mouse; typedef struct { - long key_value; + size_t key_value; KeyFlag flag; } Key; diff --git a/src/transmission/ice_transmission.cpp b/src/transmission/ice_transmission.cpp index 51a5fce..7074bf5 100644 --- a/src/transmission/ice_transmission.cpp +++ b/src/transmission/ice_transmission.cpp @@ -276,8 +276,8 @@ int IceTransmission::SendData(DATA_TYPE type, const char *data, size_t size) { if (rtp_data_sender_) { if (data_rtp_codec_) { data_rtp_codec_->Encode((uint8_t *)data, size, packets); + rtp_data_sender_->Enqueue(packets); } - rtp_data_sender_->Enqueue(packets); } } }