diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-04-28 11:04:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 11:04:05 +0200 |
| commit | 305b2a15bf1ed950e8e2ed50fa84456b584798fb (patch) | |
| tree | abaa1e01ca34382f4ea1d6e24c403ecff1502f39 /thirdparty | |
| parent | 7bca90769cbf7ae29023ca8d83ba7ab3137deda3 (diff) | |
| parent | 8247667a3ee0d86f26094e722497b0cbb99cc12b (diff) | |
Merge pull request #48239 from akien-mga/goodbye-copymem
Core: Drop custom `copymem`/`zeromem` defines
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/enet/godot.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/thirdparty/enet/godot.cpp b/thirdparty/enet/godot.cpp index 1c75414be2..140f0093eb 100644 --- a/thirdparty/enet/godot.cpp +++ b/thirdparty/enet/godot.cpp @@ -211,7 +211,7 @@ public: ERR_FAIL_COND_V(err != OK, err); ERR_FAIL_COND_V(p_len < r_read, ERR_OUT_OF_MEMORY); - copymem(p_buffer, buffer, r_read); + memcpy(p_buffer, buffer, r_read); r_ip = udp->get_packet_address(); r_port = udp->get_packet_port(); return err; @@ -315,7 +315,7 @@ public: Vector<String> s = E->key().rsplit(":", false, 1); ERR_CONTINUE(s.size() != 2); // BUG! - copymem(p_buffer, buffer, r_read); + memcpy(p_buffer, buffer, r_read); r_ip = s[0]; r_port = s[1].to_int(); break; // err = OK |