summaryrefslogtreecommitdiffstats
path: root/xpcom
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-05-04 22:42:31 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-05-04 22:42:31 +0200
commit3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d (patch)
tree2ef4b78c728a2e1a323babc75205b19911a5ffc0 /xpcom
parent175efcbab02bbfea84e565cdea9ee96d6436a08f (diff)
parent2860601772b392f3f6d2977269f11061f4e970ee (diff)
downloadUXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar
UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar.gz
UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar.lz
UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar.xz
UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.zip
Merge branch 'intl-ICU-emoji-work'
Diffstat (limited to 'xpcom')
-rw-r--r--xpcom/build/XPCOMInit.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp
index 6ead5cdc7..6fb50fc1d 100644
--- a/xpcom/build/XPCOMInit.cpp
+++ b/xpcom/build/XPCOMInit.cpp
@@ -171,9 +171,7 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**);
#include "gfxPlatform.h"
-#if EXPOSE_INTL_API
#include "unicode/putil.h"
-#endif
using namespace mozilla;
using base::AtExitManager;
@@ -689,7 +687,7 @@ NS_InitXPCOM2(nsIServiceManager** aResult,
memmove);
#endif
-#if EXPOSE_INTL_API && defined(MOZ_ICU_DATA_ARCHIVE)
+#if defined(MOZ_ICU_DATA_ARCHIVE)
nsCOMPtr<nsIFile> greDir;
nsDirectoryService::gService->Get(NS_GRE_DIR,
NS_GET_IID(nsIFile),