From b4918bbe2f7bc8139191ca444be481f18040247e Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Sat, 9 Jan 2021 19:54:51 +0100
Subject: [PATCH] LibC: Move bzero() and bcopy() per Dr. POSIX

---
 DevTools/UserspaceEmulator/Emulator.cpp |  1 +
 Libraries/LibC/string.cpp               | 10 ----------
 Libraries/LibC/string.h                 |  2 --
 Libraries/LibC/strings.cpp              | 11 +++++++++++
 Libraries/LibC/strings.h                |  2 ++
 Services/AudioServer/Mixer.cpp          |  1 +
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/DevTools/UserspaceEmulator/Emulator.cpp b/DevTools/UserspaceEmulator/Emulator.cpp
index 5a6c091f37..00a88183d5 100644
--- a/DevTools/UserspaceEmulator/Emulator.cpp
+++ b/DevTools/UserspaceEmulator/Emulator.cpp
@@ -45,6 +45,7 @@
 #include <serenity.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/select.h>
diff --git a/Libraries/LibC/string.cpp b/Libraries/LibC/string.cpp
index a6fcc8d6e9..8daee4ef49 100644
--- a/Libraries/LibC/string.cpp
+++ b/Libraries/LibC/string.cpp
@@ -38,16 +38,6 @@
 
 extern "C" {
 
-void bzero(void* dest, size_t n)
-{
-    memset(dest, 0, n);
-}
-
-void bcopy(const void* src, void* dest, size_t n)
-{
-    memmove(dest, src, n);
-}
-
 size_t strspn(const char* s, const char* accept)
 {
     const char* p = s;
diff --git a/Libraries/LibC/string.h b/Libraries/LibC/string.h
index ef3782a52e..f181477ef3 100644
--- a/Libraries/LibC/string.h
+++ b/Libraries/LibC/string.h
@@ -43,8 +43,6 @@ void* memmove(void*, const void*, size_t);
 void* memchr(const void*, int c, size_t);
 const void* memmem(const void* haystack, size_t, const void* needle, size_t);
 
-void bzero(void*, size_t);
-void bcopy(const void*, void*, size_t);
 void* memset(void*, int, size_t);
 
 __attribute__((malloc)) char* strdup(const char*);
diff --git a/Libraries/LibC/strings.cpp b/Libraries/LibC/strings.cpp
index d43d5b7b3d..b5f6579f89 100644
--- a/Libraries/LibC/strings.cpp
+++ b/Libraries/LibC/strings.cpp
@@ -26,10 +26,21 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <string.h>
 #include <strings.h>
 
 extern "C" {
 
+void bzero(void* dest, size_t n)
+{
+    memset(dest, 0, n);
+}
+
+void bcopy(const void* src, void* dest, size_t n)
+{
+    memmove(dest, src, n);
+}
+
 static char foldcase(char ch)
 {
     if (isalpha(ch))
diff --git a/Libraries/LibC/strings.h b/Libraries/LibC/strings.h
index 16b6b24ee3..b157e30489 100644
--- a/Libraries/LibC/strings.h
+++ b/Libraries/LibC/strings.h
@@ -33,5 +33,7 @@ __BEGIN_DECLS
 
 int strcasecmp(const char*, const char*);
 int strncasecmp(const char*, const char*, size_t);
+void bzero(void*, size_t);
+void bcopy(const void*, void*, size_t);
 
 __END_DECLS
diff --git a/Services/AudioServer/Mixer.cpp b/Services/AudioServer/Mixer.cpp
index 945d0bb13b..bff2a09990 100644
--- a/Services/AudioServer/Mixer.cpp
+++ b/Services/AudioServer/Mixer.cpp
@@ -30,6 +30,7 @@
 #include <AudioServer/ClientConnection.h>
 #include <AudioServer/Mixer.h>
 #include <pthread.h>
+#include <strings.h>
 
 namespace AudioServer {