diff -r 000000000000 -r 6474c204b198 intl/uconv/public/nsEncoderDecoderUtils.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/intl/uconv/public/nsEncoderDecoderUtils.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,32 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef nsEncoderDecoderUtils_h__
+#define nsEncoderDecoderUtils_h__
+
+#define NS_UNICODEDECODER_NAME "Charset Decoders"
+#define NS_UNICODEENCODER_NAME "Charset Encoders"
+
+#define NS_DATA_BUNDLE_CATEGORY     "uconv-charset-data"
+#define NS_TITLE_BUNDLE_CATEGORY    "uconv-charset-titles"
+
+#define NS_CONVERTER_REGISTRY_START \
+  static const mozilla::Module::CategoryEntry kUConvCategories[] = {
+
+#define NS_CONVERTER_REGISTRY_END \
+  { nullptr } \
+  };
+
+#define NS_UCONV_REG_UNREG_DECODER(_Charset, _CID)          \
+  { NS_UNICODEDECODER_NAME, _Charset, "" },
+  
+#define NS_UCONV_REG_UNREG_ENCODER(_Charset, _CID)          \
+  { NS_UNICODEENCODER_NAME, _Charset, "" },
+
+#define NS_UCONV_REG_UNREG(_Charset, _DecoderCID, _EncoderCID) \
+  NS_UCONV_REG_UNREG_DECODER(_Charset, *) \
+  NS_UCONV_REG_UNREG_ENCODER(_Charset, *)
+
+#endif