Index: third_party/freetype/include/config/ftstdlib.h |
diff --git a/core/include/thirdparties/freetype/freetype/config/ftstdlib.h b/third_party/freetype/include/config/ftstdlib.h |
similarity index 89% |
rename from core/include/thirdparties/freetype/freetype/config/ftstdlib.h |
rename to third_party/freetype/include/config/ftstdlib.h |
index 03be04db34ddf866b8b28cbe83e8f4dbfe0faf06..b940efc4273f68f333022d1ece8df1cc30b217fb 100644 |
--- a/core/include/thirdparties/freetype/freetype/config/ftstdlib.h |
+++ b/third_party/freetype/include/config/ftstdlib.h |
@@ -73,22 +73,22 @@ |
/* */ |
/**********************************************************************/ |
-#include "../../../../fxcrt/fx_system.h" |
+ |
#include <string.h> |
-#define ft_memchr FXSYS_memchr |
-#define ft_memcmp FXSYS_memcmp32 |
-#define ft_memcpy FXSYS_memcpy32 |
-#define ft_memmove FXSYS_memmove32 |
-#define ft_memset FXSYS_memset8 |
-//#define ft_strcat FXSYS_strcat |
-#define ft_strcmp FXSYS_strcmp |
-#define ft_strcpy FXSYS_strcpy |
-#define ft_strlen FXSYS_strlen |
-#define ft_strncmp FXSYS_strncmp |
-#define ft_strncpy FXSYS_strncpy |
-#define ft_strrchr FXSYS_strrchr |
-#define ft_strstr FXSYS_strstr |
+#define ft_memchr memchr |
+#define ft_memcmp memcmp |
+#define ft_memcpy memcpy |
+#define ft_memmove memmove |
+#define ft_memset memset |
+#define ft_strcat strcat |
+#define ft_strcmp strcmp |
+#define ft_strcpy strcpy |
+#define ft_strlen strlen |
+#define ft_strncmp strncmp |
+#define ft_strncpy strncpy |
+#define ft_strrchr strrchr |
+#define ft_strstr strstr |
/**********************************************************************/ |
@@ -100,13 +100,13 @@ |
#include <stdio.h> |
-#define FT_FILE FXSYS_FILE |
-#define ft_fclose FXSYS_fclose |
-#define ft_fopen FXSYS_fopen |
-#define ft_fread FXSYS_fread |
-#define ft_fseek FXSYS_fseek |
-#define ft_ftell FXSYS_ftell |
-#define ft_sprintf FXSYS_sprintf |
+#define FT_FILE FILE |
+#define ft_fclose fclose |
+#define ft_fopen fopen |
+#define ft_fread fread |
+#define ft_fseek fseek |
+#define ft_ftell ftell |
+#define ft_sprintf sprintf |
/**********************************************************************/ |
@@ -116,9 +116,9 @@ |
/**********************************************************************/ |
-//#include <stdlib.h> |
+#include <stdlib.h> |
-#define ft_qsort FXSYS_qsort |
+#define ft_qsort qsort |
/**********************************************************************/ |
@@ -141,7 +141,7 @@ |
/**********************************************************************/ |
-#define ft_atol FXSYS_atoi |
+#define ft_atol atol |
#define ft_labs labs |
@@ -152,7 +152,7 @@ |
/**********************************************************************/ |
-//#include <setjmp.h> |
+#include <setjmp.h> |
#define ft_jmp_buf jmp_buf /* note: this cannot be a typedef since */ |
/* jmp_buf is defined as a macro */ |