summaryrefslogtreecommitdiffstats
path: root/xpcom/io/nsNativeCharsetUtils.h
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-02-22 19:03:00 -0500
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 12:51:25 +0200
commitda15aa0fdf5ec769a0973a00d84f9fa090de0b60 (patch)
treec6f5b8197eac51be855aecdae3b5d97207cdf97e /xpcom/io/nsNativeCharsetUtils.h
parent867737dd4b650494404a90b8b99ea959f74462ca (diff)
downloadUXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.tar
UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.tar.gz
UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.tar.lz
UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.tar.xz
UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.zip
Issue #1053 - Remove android support from XPCOM
Diffstat (limited to 'xpcom/io/nsNativeCharsetUtils.h')
-rw-r--r--xpcom/io/nsNativeCharsetUtils.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/xpcom/io/nsNativeCharsetUtils.h b/xpcom/io/nsNativeCharsetUtils.h
index 5c1e670d5..c3053a7df 100644
--- a/xpcom/io/nsNativeCharsetUtils.h
+++ b/xpcom/io/nsNativeCharsetUtils.h
@@ -39,13 +39,13 @@ nsresult NS_CopyUnicodeToNative(const nsAString& aInput, nsACString& aOutput);
* a real function. On Mac OS X it's always UTF-8 while on Windows
* and other platforms (e.g. OS2), it's never UTF-8.
*/
-#if defined(XP_UNIX) && !defined(XP_MACOSX) && !defined(ANDROID)
+#if defined(XP_UNIX) && !defined(XP_MACOSX)
bool NS_IsNativeUTF8();
#else
inline bool
NS_IsNativeUTF8()
{
-#if defined(XP_MACOSX) || defined(ANDROID)
+#if defined(XP_MACOSX)
return true;
#else
return false;