diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-04 22:42:31 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-04 22:42:31 +0200 |
| commit | 3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d (patch) | |
| tree | 2ef4b78c728a2e1a323babc75205b19911a5ffc0 /netwerk/dns/nsIDNService.h | |
| parent | 175efcbab02bbfea84e565cdea9ee96d6436a08f (diff) | |
| parent | 2860601772b392f3f6d2977269f11061f4e970ee (diff) | |
| download | UXP-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 'netwerk/dns/nsIDNService.h')
| -rw-r--r-- | netwerk/dns/nsIDNService.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/netwerk/dns/nsIDNService.h b/netwerk/dns/nsIDNService.h index 19aa94da0..82a05021d 100644 --- a/netwerk/dns/nsIDNService.h +++ b/netwerk/dns/nsIDNService.h @@ -12,12 +12,7 @@ #include "nsUnicodeScriptCodes.h" #include "nsWeakReference.h" -#ifdef IDNA2008 #include "unicode/uidna.h" -#else -#include "nsIUnicodeNormalizer.h" -#include "nsIDNKitInterface.h" -#endif #include "nsString.h" @@ -151,7 +146,6 @@ private: bool illegalScriptCombo(mozilla::unicode::Script script, int32_t& savedScript); -#ifdef IDNA2008 /** * Convert a DNS label from ASCII to Unicode using IDNA2008 */ @@ -164,10 +158,6 @@ private: stringPrepFlag flag); UIDNA* mIDNA; -#else - idn_nameprep_t mNamePrepHandle; - nsCOMPtr<nsIUnicodeNormalizer> mNormalizer; -#endif nsXPIDLString mIDNBlacklist; /** |