Merge commit '25a08f450de59e5acdfcb0750aa222e5641e4cfb' as 'third_par…

…ty/ots'
youtube · Sep 11, 2023 · d8ae7c1 · d8ae7c1
2 parents 7583e2c + 25a08f4
commit d8ae7c1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/include/opentype-sanitiser.h
@@ -5,7 +5,6 @@
 #ifndef OPENTYPE_SANITISER_H_
 #define OPENTYPE_SANITISER_H_
 
-#include <cstring>
 #define MEMCPY_OPENTYPE_SANITISER std::memcpy
 
 #if defined(STARBOARD)
@@ -42,6 +41,7 @@ typedef unsigned __int64 uint64_t;
 #include <algorithm>
 #include <cassert>
 #include <cstddef>
+#include <cstring>
 
 #define OTS_TAG(c1,c2,c3,c4) ((uint32_t)((((uint8_t)(c1))<<24)|(((uint8_t)(c2))<<16)|(((uint8_t)(c3))<<8)|((uint8_t)(c4))))
 #define OTS_UNTAG(tag)       ((char)((tag)>>24)), ((char)((tag)>>16)), ((char)((tag)>>8)), ((char)(tag))

diff --git a/third_party/ots/src/cmap.cc b/third_party/ots/src/cmap.cc
@@ -9,7 +9,6 @@
 #include <utility>
 #include <vector>
 
-#include <cstring>
 #define MEMCPY_CMAP std::memcpy
 
 #if defined(STARBOARD)

diff --git a/third_party/ots/src/ots.h b/third_party/ots/src/ots.h
@@ -13,7 +13,6 @@
 #include <cstdarg>
 #include <cstddef>
 
-#include <cstring>
 #define MEMCPY_OTS std::memcpy
 
 #if defined(STARBOARD)
@@ -41,6 +40,7 @@ typedef unsigned __int64 uint64_t;
 
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include <limits>
 #include <map>
 

diff --git a/third_party/ots/src/post.cc b/third_party/ots/src/post.cc
@@ -4,8 +4,6 @@
 
 #include "post.h"
 
-#include <string.h>
-
 #include "maxp.h"
 
 // post - PostScript