From 9e58eba805fd09f6fdfa262bce31ba8f00012eb7 Mon Sep 17 00:00:00 2001 From: Ilya Mizus Date: Thu, 9 Oct 2014 17:50:09 +0400 Subject: [PATCH] Small fix for Android build on Windows --- makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/makefile b/makefile index 59fc6eb100..dc2b9dc717 100755 --- a/makefile +++ b/makefile @@ -240,12 +240,14 @@ ifneq ($(android),) -g3 \ -Werror \ -Wno-shift-count-overflow + # on Windows (in MinGW-based build) there are neither __BEGIN_DECLS nor __END_DECLS # defines; we don't want to patch every file that uses them, so we stub them in # using CFLAGS mechanism + # Also we have off64_t defined in mingw-w64 headers, so let's tell that ifeq ($(platform),windows) - android-cflags += "-D__BEGIN_DECLS=extern \"C\" {" "-D__END_DECLS=}" + android-cflags += "-D__BEGIN_DECLS=extern \"C\" {" "-D__END_DECLS=}" "-DHAVE_OFF64_T" endif luni-cpps := $(shell find $(luni-native) -name '*.cpp')