aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/freetype/config/ftstdlib.h4
-rw-r--r--include/freetype/freetype.h3
-rw-r--r--include/png/lodepng.h4
3 files changed, 9 insertions, 2 deletions
diff --git a/include/freetype/config/ftstdlib.h b/include/freetype/config/ftstdlib.h
index 2cbfb82..e507450 100644
--- a/include/freetype/config/ftstdlib.h
+++ b/include/freetype/config/ftstdlib.h
@@ -60,9 +60,13 @@
#ifndef __WCHAR_TYPE__
typedef unsigned short wchar_t;
#else
+
+#ifdef ANDROID
typedef __WCHAR_TYPE__ wchar_t;
#endif
+#endif
+
#include <lib9.h>
#define UINT_MAX 0xffffffffU
#define ULONG_MAX 0xffffffffUL
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 885634b..e8c5cf6 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -20,12 +20,13 @@
#define __FREETYPE_H__
#pragma incomplete _off_ /* it's too hard */
+#ifdef ANDROID
typedef unsigned int size_t;
//typedef unsigned short wchar_t;
typedef signed int ptrdiff_t;
//#define NULL ((void*)0)
-
+#endif
/*************************************************************************/
/* */
diff --git a/include/png/lodepng.h b/include/png/lodepng.h
index cf6667c..1548272 100644
--- a/include/png/lodepng.h
+++ b/include/png/lodepng.h
@@ -26,7 +26,9 @@ freely, subject to the following restrictions:
#ifndef LODEPNG_H
#define LODEPNG_H
-#include <string.h> /*for size_t*/
+//#include <string.h> /*for size_t*/
+typedef unsigned int size_t;
+
extern const char* LODEPNG_VERSION_STRING;