1 files changed, 10 insertions, 2 deletions

diff --git a/firmware/include/string-extra.h b/firmware/include/string-extra.h
index bae250d7c9..6a9e0c77be 100644
--- a/firmware/include/string-extra.h
+++ b/firmware/include/string-extra.h
@@ -18,8 +18,8 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-
-
+#ifndef STRING_EXTRA_H
+#define STRING_EXTRA_H
 #include <string.h>
 #include "strlcpy.h"
 #include "strlcat.h"
@@ -27,3 +27,11 @@
 #include "strcasestr.h"
 #include "strtok_r.h"
 #include "memset16.h"
+
+#if defined(WIN32) || defined(APPLICATION)
+#ifndef mempcpy
+#define mempcpy __builtin_mempcpy
+#endif
+#endif
+
+#endif /* STRING_EXTRA_H */