From c4d20f462f732dc984607416c719a2dc515fda53 Mon Sep 17 00:00:00 2001 From: "yokoyama%netscape.com" Date: Thu, 17 May 2001 00:02:21 +0000 Subject: [PATCH] bugfix for 80329; /r=sfraser; /sr=brendan git-svn-id: svn://10.0.0.236/trunk@95164 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/intl/uconv/src/nsCP1252ToUnicode.cpp | 4 ++-- .../intl/uconv/src/nsISO88591ToUnicode.cpp | 4 ++-- .../intl/uconv/src/nsMacRomanToUnicode.cpp | 4 ++-- mozilla/intl/uconv/src/nsUnicodeToCP1252.cpp | 4 ++-- .../intl/uconv/src/nsUnicodeToISO88591.cpp | 4 ++-- .../intl/uconv/src/nsUnicodeToMacRoman.cpp | 4 ++-- mozilla/intl/uconv/src/nsUnicodeToUTF8.cpp | 4 ++-- .../intl/uconv/ucvibm/nsCP850ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvibm/nsCP852ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvibm/nsCP855ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvibm/nsCP857ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvibm/nsCP862ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvibm/nsCP864ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvibm/nsCP864iToUnicode.cpp | 13 ++--------- .../intl/uconv/ucvibm/nsUnicodeToCP850.cpp | 4 ++-- .../intl/uconv/ucvibm/nsUnicodeToCP852.cpp | 4 ++-- .../intl/uconv/ucvibm/nsUnicodeToCP855.cpp | 4 ++-- .../intl/uconv/ucvibm/nsUnicodeToCP857.cpp | 4 ++-- .../intl/uconv/ucvibm/nsUnicodeToCP862.cpp | 4 ++-- .../intl/uconv/ucvibm/nsUnicodeToCP864.cpp | 4 ++-- .../intl/uconv/ucvibm/nsUnicodeToCP864i.cpp | 16 ++------------ .../intl/uconv/ucvja/nsJapaneseToUnicode.cpp | 17 +++++++------- mozilla/intl/uconv/ucvja/nsUnicodeToEUCJP.cpp | 8 +++---- .../intl/uconv/ucvja/nsUnicodeToISO2022JP.cpp | 12 +++++----- mozilla/intl/uconv/ucvja/nsUnicodeToSJIS.cpp | 4 ++-- mozilla/intl/uconv/ucvko/nsEUCKRToUnicode.cpp | 16 +++++++------- mozilla/intl/uconv/ucvko/nsUnicodeToEUCKR.cpp | 10 ++++----- mozilla/intl/uconv/ucvko/nsUnicodeToJohab.cpp | 8 +++---- .../intl/uconv/ucvko/nsUnicodeToKSC5601.cpp | 8 +++---- .../intl/uconv/ucvko/nsUnicodeToX11Johab.cpp | 16 +++++++------- .../uconv/ucvlatin/nsARMSCII8ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsAsciiToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsCP1250ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsCP1251ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsCP1253ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsCP1254ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsCP1255ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsCP1256ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsCP1257ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsCP1258ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsCP866ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsCP874ToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsISO885910ToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsISO885913ToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsISO885914ToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsISO885915ToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsISO88592ToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsISO88593ToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsISO88594ToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsISO88595ToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsISO88596ToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsISO88597ToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsISO88598ToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsISO88599ToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsISOIR111ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsKOI8RToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsKOI8UToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsMacArabicToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsMacCEToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsMacCroatianToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsMacCyrillicToUnicode.cpp | 4 ++-- .../ucvlatin/nsMacDevanagariToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsMacFarsiToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsMacGreekToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsMacGujaratiToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsMacGurmukhiToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsMacHebrewToUnicode.cpp | 4 ++-- .../ucvlatin/nsMacIcelandicToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsMacRomanianToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsMacTurkishToUnicode.cpp | 4 ++-- .../ucvlatin/nsMacUkrainianToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsT61ToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsTCVN5712ToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUCS2LEToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUCS4BEToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUCS4LEToUnicode.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToARMSCII8.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToAscii.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToCP1250.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToCP1251.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToCP1253.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToCP1254.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToCP1255.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToCP1256.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToCP1257.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToCP1258.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToCP866.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToCP874.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToISO885910.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToISO885913.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToISO885914.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToISO885915.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToISO88592.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToISO88593.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToISO88594.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToISO88595.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToISO88596.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToISO88597.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToISO88598.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToISO88599.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToISOIR111.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToKOI8R.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToKOI8U.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToMacArabic.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToMacCE.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToMacCroatian.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToMacCyrillic.cpp | 4 ++-- .../ucvlatin/nsUnicodeToMacDevanagari.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToMacFarsi.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToMacGreek.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToMacGujarati.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToMacGurmukhi.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToMacHebrew.cpp | 4 ++-- .../ucvlatin/nsUnicodeToMacIcelandic.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToMacRomanian.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToMacTurkish.cpp | 4 ++-- .../ucvlatin/nsUnicodeToMacUkrainian.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToSymbol.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToT61.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToTCVN5712.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToUCS2LE.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToUCS4BE.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToUCS4LE.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToUserDefined.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToVISCII.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsUnicodeToVPS.cpp | 4 ++-- .../uconv/ucvlatin/nsUnicodeToZapfDingbat.cpp | 4 ++-- .../uconv/ucvlatin/nsUserDefinedToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsVISCIIToUnicode.cpp | 4 ++-- .../intl/uconv/ucvlatin/nsVPSToUnicode.cpp | 4 ++-- .../intl/uconv/ucvmath/nsUnicodeToMTExtra.cpp | 4 ++-- .../uconv/ucvmath/nsUnicodeToMathematica1.cpp | 4 ++-- .../uconv/ucvmath/nsUnicodeToMathematica2.cpp | 4 ++-- .../uconv/ucvmath/nsUnicodeToMathematica3.cpp | 4 ++-- .../uconv/ucvmath/nsUnicodeToMathematica4.cpp | 4 ++-- .../uconv/ucvmath/nsUnicodeToMathematica5.cpp | 4 ++-- .../uconv/ucvmath/nsUnicodeToTeXCMEXt1.cpp | 4 ++-- .../uconv/ucvmath/nsUnicodeToTeXCMEXttf.cpp | 4 ++-- .../uconv/ucvmath/nsUnicodeToTeXCMMIt1.cpp | 4 ++-- .../uconv/ucvmath/nsUnicodeToTeXCMMIttf.cpp | 4 ++-- .../uconv/ucvmath/nsUnicodeToTeXCMRt1.cpp | 4 ++-- .../uconv/ucvmath/nsUnicodeToTeXCMRttf.cpp | 4 ++-- .../uconv/ucvmath/nsUnicodeToTeXCMSYt1.cpp | 4 ++-- .../uconv/ucvmath/nsUnicodeToTeXCMSYttf.cpp | 4 ++-- .../intl/uconv/ucvtw/nsBIG5HKSCSToUnicode.cpp | 10 ++++----- mozilla/intl/uconv/ucvtw/nsBIG5ToUnicode.cpp | 10 ++++----- mozilla/intl/uconv/ucvtw/nsUnicodeToBIG5.cpp | 8 +++---- .../intl/uconv/ucvtw/nsUnicodeToBIG5HKSCS.cpp | 8 +++---- .../uconv/ucvtw/nsUnicodeToBIG5NoAscii.cpp | 2 +- mozilla/intl/uconv/ucvtw/nsUnicodeToHKSCS.cpp | 6 ++--- .../intl/uconv/ucvtw2/nsEUCTWToUnicode.cpp | 22 +++++++++---------- .../intl/uconv/ucvtw2/nsUnicodeToEUCTW.cpp | 20 ++++++++--------- 154 files changed, 367 insertions(+), 387 deletions(-) diff --git a/mozilla/intl/uconv/src/nsCP1252ToUnicode.cpp b/mozilla/intl/uconv/src/nsCP1252ToUnicode.cpp index 4f94063a238..9ee4c5218e3 100644 --- a/mozilla/intl/uconv/src/nsCP1252ToUnicode.cpp +++ b/mozilla/intl/uconv/src/nsCP1252ToUnicode.cpp @@ -51,11 +51,11 @@ NS_IMETHODIMP NS_NewCP1252ToUnicode(nsISupports* aOuter, //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp1252.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/src/nsISO88591ToUnicode.cpp b/mozilla/intl/uconv/src/nsISO88591ToUnicode.cpp index a61bc62e63c..ec758013a7c 100644 --- a/mozilla/intl/uconv/src/nsISO88591ToUnicode.cpp +++ b/mozilla/intl/uconv/src/nsISO88591ToUnicode.cpp @@ -50,11 +50,11 @@ NS_IMETHODIMP NS_NewISO88591ToUnicode(nsISupports* aOuter, //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp1252.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/src/nsMacRomanToUnicode.cpp b/mozilla/intl/uconv/src/nsMacRomanToUnicode.cpp index 09978d2f696..8093875809f 100644 --- a/mozilla/intl/uconv/src/nsMacRomanToUnicode.cpp +++ b/mozilla/intl/uconv/src/nsMacRomanToUnicode.cpp @@ -50,11 +50,11 @@ NS_IMETHODIMP NS_NewMacRomanToUnicode(nsISupports* aOuter, //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_MacRomanMappingTable[] = { +static const PRUint16 g_MacRomanMappingTable[] = { #include "macroman.ut" }; -static PRInt16 g_MacRomanShiftTable[] = { +static const PRInt16 g_MacRomanShiftTable[] = { 1, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/src/nsUnicodeToCP1252.cpp b/mozilla/intl/uconv/src/nsUnicodeToCP1252.cpp index f28b3dcafb0..fb560e7be2d 100644 --- a/mozilla/intl/uconv/src/nsUnicodeToCP1252.cpp +++ b/mozilla/intl/uconv/src/nsUnicodeToCP1252.cpp @@ -51,11 +51,11 @@ NS_IMETHODIMP NS_NewUnicodeToCP1252(nsISupports* aOuter, //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp1252.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/src/nsUnicodeToISO88591.cpp b/mozilla/intl/uconv/src/nsUnicodeToISO88591.cpp index 5724ddf8d7d..def77e605cf 100644 --- a/mozilla/intl/uconv/src/nsUnicodeToISO88591.cpp +++ b/mozilla/intl/uconv/src/nsUnicodeToISO88591.cpp @@ -50,11 +50,11 @@ NS_IMETHODIMP NS_NewUnicodeToISO88591(nsISupports* aOuter, //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "8859-1.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/src/nsUnicodeToMacRoman.cpp b/mozilla/intl/uconv/src/nsUnicodeToMacRoman.cpp index 1cd3967e8dd..624739192bb 100644 --- a/mozilla/intl/uconv/src/nsUnicodeToMacRoman.cpp +++ b/mozilla/intl/uconv/src/nsUnicodeToMacRoman.cpp @@ -50,11 +50,11 @@ NS_IMETHODIMP NS_NewUnicodeToMacRoman(nsISupports* aOuter, //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_MacRomanMappingTable[] = { +static const PRUint16 g_MacRomanMappingTable[] = { #include "macroman.uf" }; -static PRInt16 g_MacRomanShiftTable[] = { +static const PRInt16 g_MacRomanShiftTable[] = { 1, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/src/nsUnicodeToUTF8.cpp b/mozilla/intl/uconv/src/nsUnicodeToUTF8.cpp index 6734c38543a..703a9c264eb 100644 --- a/mozilla/intl/uconv/src/nsUnicodeToUTF8.cpp +++ b/mozilla/intl/uconv/src/nsUnicodeToUTF8.cpp @@ -51,11 +51,11 @@ NS_IMETHODIMP NS_NewUnicodeToUTF8(nsISupports* aOuter, } -static PRUint16 g_UTF8MappingTable[] = { +static const PRUint16 g_UTF8MappingTable[] = { 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0xFFFF, 0x0000 }; -static PRInt16 g_UTF8ShiftTable[] = { +static const PRInt16 g_UTF8ShiftTable[] = { 3, uMultibytesCharset, ShiftCell(u1ByteChar, 1, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x7F), ShiftCell(u2BytesUTF8, 2, 0xC0, 0xDF, 0x00, 0x00, 0x07, 0xFF), diff --git a/mozilla/intl/uconv/ucvibm/nsCP850ToUnicode.cpp b/mozilla/intl/uconv/ucvibm/nsCP850ToUnicode.cpp index d672565f534..1ae76819576 100644 --- a/mozilla/intl/uconv/ucvibm/nsCP850ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvibm/nsCP850ToUnicode.cpp @@ -38,11 +38,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp850.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvibm/nsCP852ToUnicode.cpp b/mozilla/intl/uconv/ucvibm/nsCP852ToUnicode.cpp index 37503f5ab1d..81413ebfb12 100644 --- a/mozilla/intl/uconv/ucvibm/nsCP852ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvibm/nsCP852ToUnicode.cpp @@ -38,11 +38,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp852.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvibm/nsCP855ToUnicode.cpp b/mozilla/intl/uconv/ucvibm/nsCP855ToUnicode.cpp index b7299c5ef4d..2e4d7fd3bd2 100644 --- a/mozilla/intl/uconv/ucvibm/nsCP855ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvibm/nsCP855ToUnicode.cpp @@ -38,11 +38,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp855.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvibm/nsCP857ToUnicode.cpp b/mozilla/intl/uconv/ucvibm/nsCP857ToUnicode.cpp index 58257eee925..efd2c10e686 100644 --- a/mozilla/intl/uconv/ucvibm/nsCP857ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvibm/nsCP857ToUnicode.cpp @@ -38,11 +38,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp857.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvibm/nsCP862ToUnicode.cpp b/mozilla/intl/uconv/ucvibm/nsCP862ToUnicode.cpp index 409c1dc79a1..f140e9ef1df 100644 --- a/mozilla/intl/uconv/ucvibm/nsCP862ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvibm/nsCP862ToUnicode.cpp @@ -38,11 +38,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp862.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvibm/nsCP864ToUnicode.cpp b/mozilla/intl/uconv/ucvibm/nsCP864ToUnicode.cpp index 71021ed2f17..5b3a4cba7c1 100644 --- a/mozilla/intl/uconv/ucvibm/nsCP864ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvibm/nsCP864ToUnicode.cpp @@ -38,11 +38,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp864.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvibm/nsCP864iToUnicode.cpp b/mozilla/intl/uconv/ucvibm/nsCP864iToUnicode.cpp index 3d2def2342b..23b51c5e96d 100644 --- a/mozilla/intl/uconv/ucvibm/nsCP864iToUnicode.cpp +++ b/mozilla/intl/uconv/ucvibm/nsCP864iToUnicode.cpp @@ -78,24 +78,15 @@ -static PRUint16 g_utMappingTable[] = { - +static const PRUint16 g_utMappingTable[] = { #include "864i.ut" - }; - - -static PRInt16 g_utShiftTable[] = { - +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , - ShiftCell(0,0,0,0,0,0,0,0) - }; - - //---------------------------------------------------------------------- // Class nsCP864iToUnicode [implementation] diff --git a/mozilla/intl/uconv/ucvibm/nsUnicodeToCP850.cpp b/mozilla/intl/uconv/ucvibm/nsUnicodeToCP850.cpp index 055bb88f4cc..512499b7edd 100644 --- a/mozilla/intl/uconv/ucvibm/nsUnicodeToCP850.cpp +++ b/mozilla/intl/uconv/ucvibm/nsUnicodeToCP850.cpp @@ -38,11 +38,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp850.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvibm/nsUnicodeToCP852.cpp b/mozilla/intl/uconv/ucvibm/nsUnicodeToCP852.cpp index 7a9615e5e8a..62069f1eecc 100644 --- a/mozilla/intl/uconv/ucvibm/nsUnicodeToCP852.cpp +++ b/mozilla/intl/uconv/ucvibm/nsUnicodeToCP852.cpp @@ -38,11 +38,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp852.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvibm/nsUnicodeToCP855.cpp b/mozilla/intl/uconv/ucvibm/nsUnicodeToCP855.cpp index f901c80d2bc..d2cefa49037 100644 --- a/mozilla/intl/uconv/ucvibm/nsUnicodeToCP855.cpp +++ b/mozilla/intl/uconv/ucvibm/nsUnicodeToCP855.cpp @@ -38,11 +38,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp855.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvibm/nsUnicodeToCP857.cpp b/mozilla/intl/uconv/ucvibm/nsUnicodeToCP857.cpp index 9e07184764f..6a02d317391 100644 --- a/mozilla/intl/uconv/ucvibm/nsUnicodeToCP857.cpp +++ b/mozilla/intl/uconv/ucvibm/nsUnicodeToCP857.cpp @@ -38,11 +38,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp857.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvibm/nsUnicodeToCP862.cpp b/mozilla/intl/uconv/ucvibm/nsUnicodeToCP862.cpp index 843e20ba2b2..23c59647833 100644 --- a/mozilla/intl/uconv/ucvibm/nsUnicodeToCP862.cpp +++ b/mozilla/intl/uconv/ucvibm/nsUnicodeToCP862.cpp @@ -38,11 +38,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp862.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvibm/nsUnicodeToCP864.cpp b/mozilla/intl/uconv/ucvibm/nsUnicodeToCP864.cpp index 53b0a6aaf7c..0131856e71b 100644 --- a/mozilla/intl/uconv/ucvibm/nsUnicodeToCP864.cpp +++ b/mozilla/intl/uconv/ucvibm/nsUnicodeToCP864.cpp @@ -38,11 +38,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp864.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvibm/nsUnicodeToCP864i.cpp b/mozilla/intl/uconv/ucvibm/nsUnicodeToCP864i.cpp index 3d89fe96fdc..05167698c35 100644 --- a/mozilla/intl/uconv/ucvibm/nsUnicodeToCP864i.cpp +++ b/mozilla/intl/uconv/ucvibm/nsUnicodeToCP864i.cpp @@ -75,27 +75,15 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] - - - -static PRUint16 g_ufMappingTable[] = { - +static const PRUint16 g_ufMappingTable[] = { #include "864i.uf" - }; - - -static PRInt16 g_ufShiftTable[] = { - +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , - ShiftCell(0,0,0,0,0,0,0,0) - }; - - //---------------------------------------------------------------------- // Class nsUnicodeToCP864i [implementation] diff --git a/mozilla/intl/uconv/ucvja/nsJapaneseToUnicode.cpp b/mozilla/intl/uconv/ucvja/nsJapaneseToUnicode.cpp index bb071c5a1c3..85e726d4ffe 100644 --- a/mozilla/intl/uconv/ucvja/nsJapaneseToUnicode.cpp +++ b/mozilla/intl/uconv/ucvja/nsJapaneseToUnicode.cpp @@ -23,10 +23,11 @@ #include "nsUCvJaSupport.h" -static PRUint16 gJis0208map[] = { +static const PRUint16 gJis0208map[] = { #include "jis0208.ump" }; -static PRUint16 gJis0212map[] = { + +static const PRUint16 gJis0212map[] = { #include "jis0212.ump" }; @@ -36,7 +37,7 @@ NS_IMETHODIMP nsShiftJISToUnicode::Convert( const char * aSrc, PRInt32 * aSrcLen, PRUnichar * aDest, PRInt32 * aDestLen) { - static PRUint16 fbIdx[128] = + static const PRUint16 fbIdx[128] = { 0xFFFD, 0, 188, 188*2, 188*3, 188*4, 188*5, 188*6, 188*7, 188*8, 188*9, 188*10, 188*11, 188*12, 188*13, 188*14, @@ -55,7 +56,7 @@ NS_IMETHODIMP nsShiftJISToUnicode::Convert( 0xE000, 0xE000+188, 0xE000+188*2, 0xE000+188*3, 0xE000+188*4, 0xE000+188*5, 0xE000+188*6, 0xE000+188*7, 0xE000+188*8, 0xE000+188*9, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, }; - static PRUint8 sbIdx[256] = + static const PRUint8 sbIdx[256] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* 0x00 */ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* 0x08 */ @@ -192,7 +193,7 @@ NS_IMETHODIMP nsEUCJPToUnicodeV2::Convert( const char * aSrc, PRInt32 * aSrcLen, PRUnichar * aDest, PRInt32 * aDestLen) { - static PRUint16 fbIdx[128] = + static const PRUint16 fbIdx[128] = { /* 0x8X */ 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, @@ -219,7 +220,7 @@ NS_IMETHODIMP nsEUCJPToUnicodeV2::Convert( 94*79, 94*80, 94*81, 94*82, 94*83, 94*84, 94*85, 94*86, 94*87, 94*88, 94*89, 94*90, 94*91, 94*92, 94*93, 0xFFFD, }; - static PRUint8 sbIdx[256] = + static const PRUint8 sbIdx[256] = { /* 0x0X */ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, @@ -398,7 +399,7 @@ NS_IMETHODIMP nsISO2022JPToUnicodeV2::Convert( const char * aSrc, PRInt32 * aSrcLen, PRUnichar * aDest, PRInt32 * aDestLen) { - static PRUint16 fbIdx[128] = + static const PRUint16 fbIdx[128] = { /* 0x8X */ 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, @@ -425,7 +426,7 @@ NS_IMETHODIMP nsISO2022JPToUnicodeV2::Convert( 94*79, 94*80, 94*81, 94*82, 94*83, 94*84, 94*85, 94*86, 94*87, 94*88, 94*89, 94*90, 94*91, 94*92, 94*93, 0xFFFD, }; - static PRUint8 sbIdx[256] = + static const PRUint8 sbIdx[256] = { /* 0x0X */ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, diff --git a/mozilla/intl/uconv/ucvja/nsUnicodeToEUCJP.cpp b/mozilla/intl/uconv/ucvja/nsUnicodeToEUCJP.cpp index bceeecf73cc..a9f9deccd0f 100644 --- a/mozilla/intl/uconv/ucvja/nsUnicodeToEUCJP.cpp +++ b/mozilla/intl/uconv/ucvja/nsUnicodeToEUCJP.cpp @@ -27,12 +27,12 @@ // Global functions and data [declaration] // Shift Table -static PRInt16 g0201ShiftTable[] = { +static const PRInt16 g0201ShiftTable[] = { 2, uMultibytesCharset, ShiftCell(u1ByteChar, 1, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x7F), ShiftCell(u1BytePrefix8EChar, 2, 0x8E, 0x8E, 0x00, 0xA1, 0x00, 0xDF) }; -static PRInt16 g0208ShiftTable[] = { +static const PRInt16 g0208ShiftTable[] = { 0, u2BytesGRCharset, ShiftCell(0,0,0,0,0,0,0,0) }; @@ -42,7 +42,7 @@ static PRInt16 g0212ShiftTable[] = { ShiftCell(0,0,0,0,0,0,0,0) }; #define SIZE_OF_TABLES 5 -static PRInt16 *gShiftTables[SIZE_OF_TABLES] = { +static const PRInt16 *gShiftTables[SIZE_OF_TABLES] = { g0208ShiftTable, g0208ShiftTable, g0201ShiftTable, @@ -50,7 +50,7 @@ static PRInt16 *gShiftTables[SIZE_OF_TABLES] = { g0212ShiftTable }; -static PRUint16 *gMappingTables[SIZE_OF_TABLES] = { +static const PRUint16 *gMappingTables[SIZE_OF_TABLES] = { g_uf0208Mapping, g_uf0208extMapping, g_uf0201Mapping, diff --git a/mozilla/intl/uconv/ucvja/nsUnicodeToISO2022JP.cpp b/mozilla/intl/uconv/ucvja/nsUnicodeToISO2022JP.cpp index 4a3abaf1b1f..1018b8f8ff3 100644 --- a/mozilla/intl/uconv/ucvja/nsUnicodeToISO2022JP.cpp +++ b/mozilla/intl/uconv/ucvja/nsUnicodeToISO2022JP.cpp @@ -31,28 +31,28 @@ static NS_DEFINE_CID(kUnicodeEncodeHelperCID, NS_UNICODEENCODEHELPER_CID); //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufAsciiMapping [] = { +static const PRUint16 g_ufAsciiMapping [] = { 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0x007F, 0x0000 }; -static PRInt16 g_ufAsciiShift [] = { +static const PRInt16 g_ufAsciiShift [] = { 0, u1ByteCharset, ShiftCell(0,0,0,0,0,0,0,0) }; -static PRInt16 g_uf0201Shift [] = { +static const PRInt16 g_uf0201Shift [] = { 2, u1ByteCharset , ShiftCell(u1ByteChar, 1, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x7F), ShiftCell(u1ByteChar, 1, 0xA1, 0xDF, 0x00, 0xA1, 0x00, 0xDF), }; -static PRInt16 g_uf0208Shift [] = { +static const PRInt16 g_uf0208Shift [] = { 0, u2BytesCharset, ShiftCell(0,0,0,0,0,0,0,0) }; #define SIZE_OF_TABLES 5 -static PRUint16 * g_ufMappingTables[SIZE_OF_TABLES] = { +static const PRUint16 * g_ufMappingTables[SIZE_OF_TABLES] = { g_ufAsciiMapping, // ASCII ISOREG 6 g_uf0201GLMapping, // JIS X 0201-1976 ISOREG 14 g_uf0208Mapping, // JIS X 0208-1983 ISOREG 87 @@ -60,7 +60,7 @@ static PRUint16 * g_ufMappingTables[SIZE_OF_TABLES] = { g_uf0208Mapping, // JIS X 0208-1978 ISOREG 42 }; -static PRInt16 * g_ufShiftTables[SIZE_OF_TABLES] = { +static const PRInt16 * g_ufShiftTables[SIZE_OF_TABLES] = { g_ufAsciiShift, // ASCII ISOREG 6 g_uf0201Shift, // JIS X 0201-1976 ISOREG 14 g_uf0208Shift, // JIS X 0208-1983 ISOREG 87 diff --git a/mozilla/intl/uconv/ucvja/nsUnicodeToSJIS.cpp b/mozilla/intl/uconv/ucvja/nsUnicodeToSJIS.cpp index 3381ceea8d4..50b23a31fce 100644 --- a/mozilla/intl/uconv/ucvja/nsUnicodeToSJIS.cpp +++ b/mozilla/intl/uconv/ucvja/nsUnicodeToSJIS.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_SJISMappingTable[] = { +static const PRUint16 g_SJISMappingTable[] = { #include "sjis.uf" }; -static PRInt16 g_SJISShiftTable[] = { +static const PRInt16 g_SJISShiftTable[] = { 4, uMultibytesCharset, ShiftCell(u1ByteChar, 1, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x7F), ShiftCell(u1ByteChar, 1, 0xA1, 0xDF, 0x00, 0xA1, 0x00, 0xDF), diff --git a/mozilla/intl/uconv/ucvko/nsEUCKRToUnicode.cpp b/mozilla/intl/uconv/ucvko/nsEUCKRToUnicode.cpp index 589b05a9735..facebdbe57d 100644 --- a/mozilla/intl/uconv/ucvko/nsEUCKRToUnicode.cpp +++ b/mozilla/intl/uconv/ucvko/nsEUCKRToUnicode.cpp @@ -26,45 +26,45 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ASCIIShiftTable[] = { +static const PRUint16 g_ASCIIShiftTable[] = { 0, u1ByteCharset, ShiftCell(0,0,0,0,0,0,0,0) }; #ifdef MS_EUCKR -static PRUint16 g_EUCKRMappingTable[] = { +static const PRUint16 g_EUCKRMappingTable[] = { #include "u20ksc.ut" }; -static PRUint16 g_EUCKRShiftTable[] = { +static const PRUint16 g_EUCKRShiftTable[] = { 0, u2BytesCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0) }; -static uRange g_EUCKRRanges[] = { +static const uRange g_EUCKRRanges[] = { { 0x00, 0x7E }, { 0x81, 0xFE } }; #else -static PRUint16 g_EUCKRShiftTable[] = { +static const PRUint16 g_EUCKRShiftTable[] = { 0, u2BytesGRCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0) }; -static uRange g_EUCKRRanges[] = { +static const uRange g_EUCKRRanges[] = { { 0x00, 0x7E }, { 0xA1, 0xFE } }; #endif -static PRUint16 *g_EUCKRShiftTableSet [] = { +static const PRUint16 *g_EUCKRShiftTableSet [] = { g_ASCIIShiftTable, g_EUCKRShiftTable }; -static PRUint16 *g_EUCKRMappingTableSet [] ={ +static const PRUint16 *g_EUCKRMappingTableSet [] ={ g_AsciiMapping, g_utKSC5601Mapping }; diff --git a/mozilla/intl/uconv/ucvko/nsUnicodeToEUCKR.cpp b/mozilla/intl/uconv/ucvko/nsUnicodeToEUCKR.cpp index baa3e4af4d8..4f7d1476f8c 100644 --- a/mozilla/intl/uconv/ucvko/nsUnicodeToEUCKR.cpp +++ b/mozilla/intl/uconv/ucvko/nsUnicodeToEUCKR.cpp @@ -27,27 +27,27 @@ // Global functions and data [declaration] -static PRUint16 gAsciiShiftTable[] = { +static const PRUint16 gAsciiShiftTable[] = { 0, u1ByteCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRUint16 gKSC5601ShiftTable[] = { +static const PRUint16 gKSC5601ShiftTable[] = { 0, u2BytesGRCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRUint16 gComposedHangulShiftTable[] = { +static const PRUint16 gComposedHangulShiftTable[] = { 0, uComposedHangulCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRUint16 *g_EUCKRMappingTable[3] = { +static const PRUint16 *g_EUCKRMappingTable[3] = { g_AsciiMapping, g_ufKSC5601Mapping, g_HangulNullMapping }; -static PRUint16 *g_EUCKRShiftTable[3] = { +static const PRUint16 *g_EUCKRShiftTable[3] = { gAsciiShiftTable, gKSC5601ShiftTable, gComposedHangulShiftTable diff --git a/mozilla/intl/uconv/ucvko/nsUnicodeToJohab.cpp b/mozilla/intl/uconv/ucvko/nsUnicodeToJohab.cpp index 6f38b894d6c..ef898024b99 100644 --- a/mozilla/intl/uconv/ucvko/nsUnicodeToJohab.cpp +++ b/mozilla/intl/uconv/ucvko/nsUnicodeToJohab.cpp @@ -27,21 +27,21 @@ // Global functions and data [declaration] -static PRUint16 gJohabSymbolShiftTable[] = { +static const PRUint16 gJohabSymbolShiftTable[] = { 0, uJohabSymbolCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRUint16 gJohabHangulShiftTable[] = { +static const PRUint16 gJohabHangulShiftTable[] = { 0, uJohabHangulCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRUint16 *g_JohabMappingTable[2] = { +static const PRUint16 *g_JohabMappingTable[2] = { g_HangulNullMapping, g_ufKSC5601Mapping }; -static PRUint16 *g_JohabShiftTable[2] = { +static const PRUint16 *g_JohabShiftTable[2] = { gJohabHangulShiftTable, gJohabSymbolShiftTable }; diff --git a/mozilla/intl/uconv/ucvko/nsUnicodeToKSC5601.cpp b/mozilla/intl/uconv/ucvko/nsUnicodeToKSC5601.cpp index 1bd60d7a8db..bd4d01c63dc 100644 --- a/mozilla/intl/uconv/ucvko/nsUnicodeToKSC5601.cpp +++ b/mozilla/intl/uconv/ucvko/nsUnicodeToKSC5601.cpp @@ -26,22 +26,22 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g2BytesShiftTable[] = { +static const PRUint16 g2BytesShiftTable[] = { 0, u2BytesCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRUint16 gComposedHangulShiftTable[] = { +static const PRUint16 gComposedHangulShiftTable[] = { 0, uComposedHangulGLCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRUint16 *g_MappingTable[3] = { +static const PRUint16 *g_MappingTable[3] = { g_ufKSC5601Mapping, g_HangulNullMapping }; -static PRUint16 *g_ShiftTable[3] = { +static const PRUint16 *g_ShiftTable[3] = { g2BytesShiftTable, gComposedHangulShiftTable }; diff --git a/mozilla/intl/uconv/ucvko/nsUnicodeToX11Johab.cpp b/mozilla/intl/uconv/ucvko/nsUnicodeToX11Johab.cpp index b8d9f157610..9141e20ae15 100644 --- a/mozilla/intl/uconv/ucvko/nsUnicodeToX11Johab.cpp +++ b/mozilla/intl/uconv/ucvko/nsUnicodeToX11Johab.cpp @@ -313,7 +313,7 @@ NS_IMETHODIMP nsUnicodeToX11Johab::GetMaxLength( // 151 // The base font index for leading consonants // 152 // 153 static final short[] lconBase = { -static PRUint16 lconBase[] = { +static const PRUint16 lconBase[] = { /* 154 */ // modern leading consonants (19) /* 155 */ 1, 11, 21, 31, 41, 51, /* 156 */ 61, 71, 81, 91, 101, 111, @@ -341,7 +341,7 @@ static PRUint16 lconBase[] = { // 177 // The base font index for vowels // 178 // 179 static final short[] vowBase = { -static PRUint16 vowBase[] = { +static const PRUint16 vowBase[] = { /* 180 */ // modern vowels (filler + 21) /* 181 */ 0,311,314,317,320,323, // (Fill), A, AE, YA, YAE, EO /* 182 */ 326,329,332,335,339,343, // E, YEO, YE, O, WA, WAE @@ -363,7 +363,7 @@ static PRUint16 vowBase[] = { // 204 // The base font index for trailing consonants // 205 // 206 static final short[] tconBase = { -static PRUint16 tconBase[] = { +static const PRUint16 tconBase[] = { // 207 // modern trailing consonants (filler + 27) /* 208 */ 0, /* 209 */ 405, 409, 413, 417, 421, @@ -391,7 +391,7 @@ static PRUint16 tconBase[] = { // 230 // in absence of trailing consonant // 231 // 232 static final short[] lconMap1 = { -static PRUint8 lconMap1[] = { +static const PRUint8 lconMap1[] = { /* 233 */ 0,0,0,0,0,0, // (Fill), A, AE, YA, YAE, EO /* 234 */ 0,0,0,1,3,3, // E, YEO, YE, O, WA, WAE /* 235 */ 3,1,2,4,4,4, // OI, YO, U, WEO, WE, WI @@ -412,7 +412,7 @@ static PRUint8 lconMap1[] = { // 251 // The mapping from vowels to leading consonant type // 252 // in presence of trailing consonant // 253 -static PRUint8 lconMap2[] = { +static const PRUint8 lconMap2[] = { // 254 static final short[] lconMap2 = { /* 255 */ 5,5,5,5,5,5, // (Fill), A, AE, YA, YAE, EO /* 256 */ 5,5,5,6,8,8, // E, YEO, YE, O, WA, WAE @@ -433,7 +433,7 @@ static PRUint8 lconMap2[] = { // 272 // 273 // vowel type ; 1 = o and its alikes, 0 = others // 274 static final short[] vowType = { -static PRUint8 vowType[] = { +static const PRUint8 vowType[] = { /* 275 */ 0,0,0,0,0,0, /* 276 */ 0,0,0,1,1,1, /* 277 */ 1,1,0,0,0,0, @@ -454,7 +454,7 @@ static PRUint8 vowType[] = { // 293 // The mapping from trailing consonants to vowel type // 294 // 295 static final int[] tconType = { -static PRUint8 tconType[] = { +static const PRUint8 tconType[] = { /* 296 */ 0, 1, 1, 1, 2, 1, /* 297 */ 1, 1, 1, 1, 1, 1, /* 298 */ 1, 1, 1, 1, 1, 1, @@ -478,7 +478,7 @@ static PRUint8 tconType[] = { // 315 // The mapping from vowels to trailing consonant type // 316 // 317 static final int[] tconMap = { -static PRUint8 tconMap[] = { +static const PRUint8 tconMap[] = { /* 318 */ 0, 0, 2, 0, 2, 1, // (Fill), A, AE, YA, YAE, EO /* 319 */ 2, 1, 2, 3, 0, 0, // E, YEO, YE, O, WA, WAE /* 320 */ 0, 3, 3, 1, 1, 1, // OI, YO, U, WEO, WE, WI diff --git a/mozilla/intl/uconv/ucvlatin/nsARMSCII8ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsARMSCII8ToUnicode.cpp index 7b39b4ab5df..9225060c1ec 100644 --- a/mozilla/intl/uconv/ucvlatin/nsARMSCII8ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsARMSCII8ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "armscii.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsAsciiToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsAsciiToUnicode.cpp index b8fa2cd6548..030cbb347e1 100644 --- a/mozilla/intl/uconv/ucvlatin/nsAsciiToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsAsciiToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0x007F, 0x0000 }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsCP1250ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsCP1250ToUnicode.cpp index 46f4eb520e9..fdd7191481e 100644 --- a/mozilla/intl/uconv/ucvlatin/nsCP1250ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsCP1250ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp1250.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsCP1251ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsCP1251ToUnicode.cpp index 62da6ef3c2b..dc39e9c73a8 100644 --- a/mozilla/intl/uconv/ucvlatin/nsCP1251ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsCP1251ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp1251.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsCP1253ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsCP1253ToUnicode.cpp index 59142838fc3..4010fcf8905 100644 --- a/mozilla/intl/uconv/ucvlatin/nsCP1253ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsCP1253ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp1253.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsCP1254ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsCP1254ToUnicode.cpp index 8559a63ba4e..3cb8e17ddac 100644 --- a/mozilla/intl/uconv/ucvlatin/nsCP1254ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsCP1254ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp1254.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsCP1255ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsCP1255ToUnicode.cpp index 946b3e4903c..7725560817a 100644 --- a/mozilla/intl/uconv/ucvlatin/nsCP1255ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsCP1255ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp1255.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsCP1256ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsCP1256ToUnicode.cpp index f4e32331719..3fe2d64a601 100644 --- a/mozilla/intl/uconv/ucvlatin/nsCP1256ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsCP1256ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp1256.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsCP1257ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsCP1257ToUnicode.cpp index 7ec3b55f96d..f9d31911354 100644 --- a/mozilla/intl/uconv/ucvlatin/nsCP1257ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsCP1257ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp1257.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsCP1258ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsCP1258ToUnicode.cpp index 2da8e12b4e1..f26fd99f48e 100644 --- a/mozilla/intl/uconv/ucvlatin/nsCP1258ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsCP1258ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp1258.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsCP866ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsCP866ToUnicode.cpp index dd381bbd5a8..6ec964837cc 100644 --- a/mozilla/intl/uconv/ucvlatin/nsCP866ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsCP866ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp866.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsCP874ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsCP874ToUnicode.cpp index a9bfcba0fb1..117eaefd264 100644 --- a/mozilla/intl/uconv/ucvlatin/nsCP874ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsCP874ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "cp874.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsISO885910ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsISO885910ToUnicode.cpp index 6abbcb4067a..efd500e8b8a 100644 --- a/mozilla/intl/uconv/ucvlatin/nsISO885910ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsISO885910ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "8859-10.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsISO885913ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsISO885913ToUnicode.cpp index 1dfd653677f..f56b7476b24 100644 --- a/mozilla/intl/uconv/ucvlatin/nsISO885913ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsISO885913ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "8859-13.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsISO885914ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsISO885914ToUnicode.cpp index 5dc05d6ca1d..7cb89ccc07d 100644 --- a/mozilla/intl/uconv/ucvlatin/nsISO885914ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsISO885914ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "8859-14.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsISO885915ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsISO885915ToUnicode.cpp index 4995ced7ed8..90b55531d8f 100644 --- a/mozilla/intl/uconv/ucvlatin/nsISO885915ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsISO885915ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "8859-15.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsISO88592ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsISO88592ToUnicode.cpp index a97f7eae53b..4fa8b24e415 100644 --- a/mozilla/intl/uconv/ucvlatin/nsISO88592ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsISO88592ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "8859-2.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsISO88593ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsISO88593ToUnicode.cpp index 2df124e0ec6..5a516df0d3f 100644 --- a/mozilla/intl/uconv/ucvlatin/nsISO88593ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsISO88593ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "8859-3.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsISO88594ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsISO88594ToUnicode.cpp index d6455e284de..866309d4c7b 100644 --- a/mozilla/intl/uconv/ucvlatin/nsISO88594ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsISO88594ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "8859-4.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsISO88595ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsISO88595ToUnicode.cpp index bf1d5300867..3162396e93f 100644 --- a/mozilla/intl/uconv/ucvlatin/nsISO88595ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsISO88595ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "8859-5.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsISO88596ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsISO88596ToUnicode.cpp index f09624d58f7..9a3aa9793da 100644 --- a/mozilla/intl/uconv/ucvlatin/nsISO88596ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsISO88596ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "8859-6.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.cpp index 2d3ba32d00f..9858664cc6e 100644 --- a/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "8859-7.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsISO88598ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsISO88598ToUnicode.cpp index f397045a6d1..caa37d803db 100644 --- a/mozilla/intl/uconv/ucvlatin/nsISO88598ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsISO88598ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "8859-8.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsISO88599ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsISO88599ToUnicode.cpp index c3c7320491b..702fc1da66a 100644 --- a/mozilla/intl/uconv/ucvlatin/nsISO88599ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsISO88599ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "8859-9.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsISOIR111ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsISOIR111ToUnicode.cpp index bdf35b4419e..5d485b270f1 100644 --- a/mozilla/intl/uconv/ucvlatin/nsISOIR111ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsISOIR111ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "iso-ir-111.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsKOI8RToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsKOI8RToUnicode.cpp index b95d749f832..9cdb1deefe9 100644 --- a/mozilla/intl/uconv/ucvlatin/nsKOI8RToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsKOI8RToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "koi8r.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsKOI8UToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsKOI8UToUnicode.cpp index c5ee183c119..5d2037c0dee 100644 --- a/mozilla/intl/uconv/ucvlatin/nsKOI8UToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsKOI8UToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "koi8u.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsMacArabicToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsMacArabicToUnicode.cpp index 5c88ab54cc1..0afe050efe8 100644 --- a/mozilla/intl/uconv/ucvlatin/nsMacArabicToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsMacArabicToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "macarabic.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsMacCEToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsMacCEToUnicode.cpp index 3f8b1b6c417..32ae5419c3a 100644 --- a/mozilla/intl/uconv/ucvlatin/nsMacCEToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsMacCEToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_MacCEMappingTable[] = { +static const PRUint16 g_MacCEMappingTable[] = { #include "macce.ut" }; -static PRInt16 g_MacCEShiftTable[] = { +static const PRInt16 g_MacCEShiftTable[] = { 1, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsMacCroatianToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsMacCroatianToUnicode.cpp index 3f3b5c2861e..8b34e466ef9 100644 --- a/mozilla/intl/uconv/ucvlatin/nsMacCroatianToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsMacCroatianToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "maccroat.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsMacCyrillicToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsMacCyrillicToUnicode.cpp index c2c04f04949..1a39e31ee1d 100644 --- a/mozilla/intl/uconv/ucvlatin/nsMacCyrillicToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsMacCyrillicToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "maccyril.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsMacDevanagariToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsMacDevanagariToUnicode.cpp index 473f92b48a8..3cda3c867c2 100644 --- a/mozilla/intl/uconv/ucvlatin/nsMacDevanagariToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsMacDevanagariToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "macdevanaga.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsMacFarsiToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsMacFarsiToUnicode.cpp index 09d9d073b69..96270b22fea 100644 --- a/mozilla/intl/uconv/ucvlatin/nsMacFarsiToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsMacFarsiToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "macfarsi.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsMacGreekToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsMacGreekToUnicode.cpp index eee66e9b492..36cf9cc8809 100644 --- a/mozilla/intl/uconv/ucvlatin/nsMacGreekToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsMacGreekToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_MacGreekMappingTable[] = { +static const PRUint16 g_MacGreekMappingTable[] = { #include "macgreek.ut" }; -static PRInt16 g_MacGreekShiftTable[] = { +static const PRInt16 g_MacGreekShiftTable[] = { 1, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsMacGujaratiToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsMacGujaratiToUnicode.cpp index eeb86e43ac9..468086d41bb 100644 --- a/mozilla/intl/uconv/ucvlatin/nsMacGujaratiToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsMacGujaratiToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "macgujarati.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsMacGurmukhiToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsMacGurmukhiToUnicode.cpp index c69294ff4aa..198ae6b489d 100644 --- a/mozilla/intl/uconv/ucvlatin/nsMacGurmukhiToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsMacGurmukhiToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "macgurmukhi.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsMacHebrewToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsMacHebrewToUnicode.cpp index e418717b370..0992fa6df27 100644 --- a/mozilla/intl/uconv/ucvlatin/nsMacHebrewToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsMacHebrewToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "machebrew.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsMacIcelandicToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsMacIcelandicToUnicode.cpp index 12262a350e6..30c4672dba6 100644 --- a/mozilla/intl/uconv/ucvlatin/nsMacIcelandicToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsMacIcelandicToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "macicela.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsMacRomanianToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsMacRomanianToUnicode.cpp index 90154a627ac..dc98a27998f 100644 --- a/mozilla/intl/uconv/ucvlatin/nsMacRomanianToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsMacRomanianToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "macro.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsMacTurkishToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsMacTurkishToUnicode.cpp index 826398f7744..96d76609015 100644 --- a/mozilla/intl/uconv/ucvlatin/nsMacTurkishToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsMacTurkishToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_MacTurkishMappingTable[] = { +static const PRUint16 g_MacTurkishMappingTable[] = { #include "macturki.ut" }; -static PRInt16 g_MacTurkishShiftTable[] = { +static const PRInt16 g_MacTurkishShiftTable[] = { 1, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsMacUkrainianToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsMacUkrainianToUnicode.cpp index ba08cffeae2..d33feee13c4 100644 --- a/mozilla/intl/uconv/ucvlatin/nsMacUkrainianToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsMacUkrainianToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "macukrai.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsT61ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsT61ToUnicode.cpp index 3a75c44cb65..cb525e68410 100644 --- a/mozilla/intl/uconv/ucvlatin/nsT61ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsT61ToUnicode.cpp @@ -25,12 +25,12 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_T61MappingTable[] = { +static const PRUint16 g_T61MappingTable[] = { #include "t61.ut" }; -static PRInt16 g_T61ShiftTable[] = { +static const PRInt16 g_T61ShiftTable[] = { 3, uMultibytesCharset, ShiftCell(u1ByteChar, 1, 0x00, 0xBF, 0x00, 0x00, 0x00, 0xBF), ShiftCell(u1ByteChar, 1, 0xD0, 0xFF, 0x00, 0xD0, 0x00, 0xFF), diff --git a/mozilla/intl/uconv/ucvlatin/nsTCVN5712ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsTCVN5712ToUnicode.cpp index 090a8b71be1..abc4b62d95b 100644 --- a/mozilla/intl/uconv/ucvlatin/nsTCVN5712ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsTCVN5712ToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "tcvn5712.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp index d9255f1a9a8..279cc28012b 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp @@ -26,11 +26,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_UCS2BEMappingTable[] = { +static const PRUint16 g_UCS2BEMappingTable[] = { 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0xFFFF, 0x0000 }; -static PRInt16 g_UCS2BEShiftTable[] = { +static const PRInt16 g_UCS2BEShiftTable[] = { 0, u2BytesCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUCS2LEToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsUCS2LEToUnicode.cpp index f340b0768a4..109d7e8edc5 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUCS2LEToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUCS2LEToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_UCS2LEMappingTable[] = { +static const PRUint16 g_UCS2LEMappingTable[] = { 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0xFFFF, 0x0000 }; -static PRInt16 g_UCS2LEShiftTable[] = { +static const PRInt16 g_UCS2LEShiftTable[] = { 0, u2BytesSwapCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUCS4BEToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsUCS4BEToUnicode.cpp index 5cbeb8c5805..9a1f85f6642 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUCS4BEToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUCS4BEToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_UCS4BEMappingTable[] = { +static const PRUint16 g_UCS4BEMappingTable[] = { 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0xFFFF, 0x0000 }; -static PRInt16 g_UCS4BEShiftTable[] = { +static const PRInt16 g_UCS4BEShiftTable[] = { 0, u4BytesCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUCS4LEToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsUCS4LEToUnicode.cpp index ed01e8e7b23..eacdc9fea67 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUCS4LEToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUCS4LEToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_UCS4LEMappingTable[] = { +static const PRUint16 g_UCS4LEMappingTable[] = { 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0xFFFF, 0x0000 }; -static PRInt16 g_UCS4LEShiftTable[] = { +static const PRInt16 g_UCS4LEShiftTable[] = { 0, u4BytesSwapCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToARMSCII8.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToARMSCII8.cpp index c6905d24c5f..dd19dc98db2 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToARMSCII8.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToARMSCII8.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "armscii.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToAscii.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToAscii.cpp index 9c3e20e8a29..a28b2c53b45 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToAscii.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToAscii.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0x007F, 0x0000 }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1250.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1250.cpp index 5a3be3fee52..4f4bd6ef73a 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1250.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1250.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp1250.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1251.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1251.cpp index e56855bac4c..49594020578 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1251.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1251.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp1251.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1253.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1253.cpp index a1415c4de90..5ae86fef0ec 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1253.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1253.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp1253.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1254.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1254.cpp index 153d1ea99f5..0d99f0f0f39 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1254.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1254.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp1254.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1255.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1255.cpp index b6168a6b7ce..535928a47cf 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1255.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1255.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp1255.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1256.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1256.cpp index eadccedc8bd..1b4b7c67a32 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1256.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1256.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp1256.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1257.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1257.cpp index b7ecf1062f2..291fe38b0c9 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1257.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1257.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp1257.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1258.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1258.cpp index 25d3309b6a8..7e87b0dcea4 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1258.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP1258.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp1258.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP866.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP866.cpp index ca67af0104c..eadc4d9f863 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP866.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP866.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp866.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP874.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP874.cpp index d3a6fe8f202..69f8d84b639 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP874.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToCP874.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "cp874.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO885910.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO885910.cpp index 51b623b4b5b..08673fc2bc7 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO885910.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO885910.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "8859-10.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO885913.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO885913.cpp index 8109d22aa89..d5d6d804688 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO885913.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO885913.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "8859-13.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO885914.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO885914.cpp index 70fc4c44e81..2de132b0a30 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO885914.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO885914.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "8859-14.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO885915.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO885915.cpp index 076b36e77f5..8990992ed6d 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO885915.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO885915.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "8859-15.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88592.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88592.cpp index 8e3bd1a61ce..33a11d5d65a 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88592.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88592.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "8859-2.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88593.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88593.cpp index 1d0a02ae369..ef01200c439 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88593.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88593.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "8859-3.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88594.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88594.cpp index affbe7b7c55..fd50b3e96b9 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88594.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88594.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "8859-4.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88595.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88595.cpp index 7c900cc6aef..01a8d50cc65 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88595.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88595.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "8859-5.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88596.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88596.cpp index d3997783eb8..11e87a979b3 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88596.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88596.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "8859-6.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88597.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88597.cpp index a51319848cb..84a17aff9fe 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88597.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88597.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "8859-7.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88598.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88598.cpp index 2e293d3a29d..f6c228c49a8 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88598.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88598.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "8859-8.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88599.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88599.cpp index f3cc2ebeed8..a162ec98d2b 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88599.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISO88599.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "8859-9.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISOIR111.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISOIR111.cpp index b9a41592612..b299f564f70 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToISOIR111.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToISOIR111.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "iso-ir-111.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToKOI8R.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToKOI8R.cpp index 1de8556605b..d2a05d9aaa8 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToKOI8R.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToKOI8R.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "koi8r.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToKOI8U.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToKOI8U.cpp index d2d12c5c239..a746d11d664 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToKOI8U.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToKOI8U.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "koi8u.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacArabic.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacArabic.cpp index d6a4f5fd0de..1c20fb4cb7e 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacArabic.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacArabic.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "macarabic.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacCE.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacCE.cpp index f2ba6ac8fc4..5bc654ff841 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacCE.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacCE.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_MacCEMappingTable[] = { +static const PRUint16 g_MacCEMappingTable[] = { #include "macce.uf" }; -static PRInt16 g_MacCEShiftTable[] = { +static const PRInt16 g_MacCEShiftTable[] = { 1, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacCroatian.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacCroatian.cpp index c8408c7fa6e..adeb7222aaa 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacCroatian.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacCroatian.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "maccroat.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacCyrillic.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacCyrillic.cpp index a3655592d38..49650245db3 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacCyrillic.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacCyrillic.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "maccyril.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacDevanagari.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacDevanagari.cpp index 2e69fa2ae99..22093c48ed5 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacDevanagari.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacDevanagari.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "macdevanaga.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacFarsi.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacFarsi.cpp index 7df70741519..04e21c42fd0 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacFarsi.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacFarsi.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "macfarsi.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacGreek.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacGreek.cpp index 1c24a582745..361cde7cd40 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacGreek.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacGreek.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_MacGreekMappingTable[] = { +static const PRUint16 g_MacGreekMappingTable[] = { #include "macgreek.uf" }; -static PRInt16 g_MacGreekShiftTable[] = { +static const PRInt16 g_MacGreekShiftTable[] = { 1, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacGujarati.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacGujarati.cpp index 232407bf7d5..83e73a01920 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacGujarati.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacGujarati.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "macgujarati.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacGurmukhi.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacGurmukhi.cpp index de0c26d0dc5..322fa1c8fa8 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacGurmukhi.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacGurmukhi.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "macgurmukhi.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacHebrew.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacHebrew.cpp index 01f3420c6e7..359f96ab3df 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacHebrew.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacHebrew.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "machebrew.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacIcelandic.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacIcelandic.cpp index c5de18c2df7..84f459f1dbd 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacIcelandic.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacIcelandic.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "macicela.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacRomanian.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacRomanian.cpp index 22cc286546d..88cd5df8b3f 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacRomanian.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacRomanian.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "macro.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacTurkish.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacTurkish.cpp index 47f71e6dc0d..b26040dc170 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacTurkish.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacTurkish.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_MacTurkishMappingTable[] = { +static const PRUint16 g_MacTurkishMappingTable[] = { #include "macturki.uf" }; -static PRInt16 g_MacTurkishShiftTable[] = { +static const PRInt16 g_MacTurkishShiftTable[] = { 1, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacUkrainian.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacUkrainian.cpp index 4ba1c3e6841..4585aceb1f0 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacUkrainian.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToMacUkrainian.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "macukrai.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToSymbol.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToSymbol.cpp index 0ce86663e4c..53ded9b2ad0 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToSymbol.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToSymbol.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "adobesymbol.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToT61.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToT61.cpp index f9b5c16db35..33f13089893 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToT61.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToT61.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_T61MappingTable[] = { +static const PRUint16 g_T61MappingTable[] = { #include "t61.uf" }; -static PRInt16 g_T61ShiftTable[] = { +static const PRInt16 g_T61ShiftTable[] = { 3, uMultibytesCharset, ShiftCell(u1ByteChar, 1, 0x00, 0xBF, 0x00, 0x00, 0x00, 0xBF), ShiftCell(u1ByteChar, 1, 0xD0, 0xFF, 0x00, 0xD0, 0x00, 0xFF), diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToTCVN5712.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToTCVN5712.cpp index f5c723a6853..ed25b8fc381 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToTCVN5712.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToTCVN5712.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "tcvn5712.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp index 02c59cc0a44..00288e361f7 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp @@ -26,11 +26,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_UCS2BEMappingTable[] = { +static const PRUint16 g_UCS2BEMappingTable[] = { 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0xFFFF, 0x0000 }; -static PRInt16 g_UCS2BEShiftTable[] = { +static const PRInt16 g_UCS2BEShiftTable[] = { 0, u2BytesCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS2LE.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS2LE.cpp index 0dbc646fcce..f2414ef6fd8 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS2LE.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS2LE.cpp @@ -26,11 +26,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_UCS2LEMappingTable[] = { +static const PRUint16 g_UCS2LEMappingTable[] = { 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0xFFFF, 0x0000 }; -static PRInt16 g_UCS2LEShiftTable[] = { +static const PRInt16 g_UCS2LEShiftTable[] = { 0, u2BytesSwapCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS4BE.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS4BE.cpp index afce52f76a0..e336d0ef2d1 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS4BE.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS4BE.cpp @@ -26,11 +26,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_UCS4BEMappingTable[] = { +static const PRUint16 g_UCS4BEMappingTable[] = { 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0xFFFF, 0x0000 }; -static PRInt16 g_UCS4BEShiftTable[] = { +static const PRInt16 g_UCS4BEShiftTable[] = { 0, u4BytesCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS4LE.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS4LE.cpp index 0f2045d7e46..c7da233be3e 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS4LE.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS4LE.cpp @@ -26,11 +26,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_UCS4LEMappingTable[] = { +static const PRUint16 g_UCS4LEMappingTable[] = { 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0xFFFF, 0x0000 }; -static PRInt16 g_UCS4LEShiftTable[] = { +static const PRInt16 g_UCS4LEShiftTable[] = { 0, u4BytesSwapCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToUserDefined.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToUserDefined.cpp index da0790f5aef..ba24220053c 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToUserDefined.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToUserDefined.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "userdefined.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToVISCII.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToVISCII.cpp index 1c18f585e07..76fe4d25107 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToVISCII.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToVISCII.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "viscii.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToVPS.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToVPS.cpp index 141d01d0aed..18a1fbf5d04 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToVPS.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToVPS.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "vps.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToZapfDingbat.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToZapfDingbat.cpp index 3056afc79cb..3a0acfabe10 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToZapfDingbat.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToZapfDingbat.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "adobezingbat.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUserDefinedToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsUserDefinedToUnicode.cpp index 4d872e55cac..4fcb935d9e1 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUserDefinedToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUserDefinedToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "userdefined.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsVISCIIToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsVISCIIToUnicode.cpp index 5b15605b892..801920cc630 100644 --- a/mozilla/intl/uconv/ucvlatin/nsVISCIIToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsVISCIIToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "viscii.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvlatin/nsVPSToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsVPSToUnicode.cpp index 2d838a4a736..243b81ed9fa 100644 --- a/mozilla/intl/uconv/ucvlatin/nsVPSToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsVPSToUnicode.cpp @@ -25,11 +25,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_utMappingTable[] = { +static const PRUint16 g_utMappingTable[] = { #include "vps.ut" }; -static PRInt16 g_utShiftTable[] = { +static const PRInt16 g_utShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvmath/nsUnicodeToMTExtra.cpp b/mozilla/intl/uconv/ucvmath/nsUnicodeToMTExtra.cpp index 48ab44de65d..422903a40b5 100644 --- a/mozilla/intl/uconv/ucvmath/nsUnicodeToMTExtra.cpp +++ b/mozilla/intl/uconv/ucvmath/nsUnicodeToMTExtra.cpp @@ -36,11 +36,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "mtextra.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica1.cpp b/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica1.cpp index 76b98aa9e3c..89d062ff4b3 100644 --- a/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica1.cpp +++ b/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica1.cpp @@ -36,11 +36,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "mathematica1.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica2.cpp b/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica2.cpp index 2cc7f3a26e8..04584732c35 100644 --- a/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica2.cpp +++ b/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica2.cpp @@ -36,11 +36,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "mathematica2.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica3.cpp b/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica3.cpp index 75c67503cfd..889ce56a823 100644 --- a/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica3.cpp +++ b/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica3.cpp @@ -36,11 +36,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "mathematica3.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica4.cpp b/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica4.cpp index e6a8af4b47c..14478c279ae 100644 --- a/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica4.cpp +++ b/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica4.cpp @@ -36,11 +36,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "mathematica4.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica5.cpp b/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica5.cpp index 5cce9d8e1fe..feb2eaa0b8f 100644 --- a/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica5.cpp +++ b/mozilla/intl/uconv/ucvmath/nsUnicodeToMathematica5.cpp @@ -36,11 +36,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "mathematica5.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMEXt1.cpp b/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMEXt1.cpp index 81bd5c68635..21499c9ba8c 100644 --- a/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMEXt1.cpp +++ b/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMEXt1.cpp @@ -36,11 +36,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "texcmex-t1.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMEXttf.cpp b/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMEXttf.cpp index 9caad43e8ed..82caacffd7f 100644 --- a/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMEXttf.cpp +++ b/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMEXttf.cpp @@ -36,11 +36,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "texcmex-ttf.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMMIt1.cpp b/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMMIt1.cpp index bec227e8d9d..a09d085eb62 100644 --- a/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMMIt1.cpp +++ b/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMMIt1.cpp @@ -36,11 +36,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "texcmmi-t1.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMMIttf.cpp b/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMMIttf.cpp index 88db005a5fe..5bbbe1b71a9 100644 --- a/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMMIttf.cpp +++ b/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMMIttf.cpp @@ -36,11 +36,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "texcmmi-ttf.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMRt1.cpp b/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMRt1.cpp index fbd71a41b9d..48da48b8b62 100644 --- a/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMRt1.cpp +++ b/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMRt1.cpp @@ -36,11 +36,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "texcmr-t1.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMRttf.cpp b/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMRttf.cpp index 3063be2e461..bc995b7c8be 100644 --- a/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMRttf.cpp +++ b/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMRttf.cpp @@ -36,11 +36,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "texcmr-ttf.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMSYt1.cpp b/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMSYt1.cpp index aa94b532ed9..1f9272d89e3 100644 --- a/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMSYt1.cpp +++ b/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMSYt1.cpp @@ -36,11 +36,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "texcmsy-t1.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMSYttf.cpp b/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMSYttf.cpp index 56aad901bbd..ee475eb1447 100644 --- a/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMSYttf.cpp +++ b/mozilla/intl/uconv/ucvmath/nsUnicodeToTeXCMSYttf.cpp @@ -36,11 +36,11 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 g_ufMappingTable[] = { +static const PRUint16 g_ufMappingTable[] = { #include "texcmsy-ttf.uf" }; -static PRInt16 g_ufShiftTable[] = { +static const PRInt16 g_ufShiftTable[] = { 0, u1ByteCharset , ShiftCell(0,0,0,0,0,0,0,0) }; diff --git a/mozilla/intl/uconv/ucvtw/nsBIG5HKSCSToUnicode.cpp b/mozilla/intl/uconv/ucvtw/nsBIG5HKSCSToUnicode.cpp index f1aaacb42b7..0cee25590ee 100644 --- a/mozilla/intl/uconv/ucvtw/nsBIG5HKSCSToUnicode.cpp +++ b/mozilla/intl/uconv/ucvtw/nsBIG5HKSCSToUnicode.cpp @@ -28,17 +28,17 @@ // Global functions and data [declaration] -static PRInt16 g_BIG5HKSCSShiftTable[] = { +static const PRInt16 g_BIG5HKSCSShiftTable[] = { 0, u2BytesCharset, ShiftCell(0,0,0,0,0,0,0,0) }; -static PRInt16 g_ASCIIShiftTable[] = { +static const PRInt16 g_ASCIIShiftTable[] = { 0, u1ByteCharset, ShiftCell(0,0,0,0,0,0,0,0) }; -static PRInt16 *g_BIG5HKSCSShiftTableSet [] = { +static const PRInt16 *g_BIG5HKSCSShiftTableSet [] = { g_ASCIIShiftTable, g_BIG5HKSCSShiftTable, @@ -48,7 +48,7 @@ static PRInt16 *g_BIG5HKSCSShiftTableSet [] = { g_BIG5HKSCSShiftTable }; -static PRUint16 *g_BIG5HKSCSMappingTableSet [] ={ +static const PRUint16 *g_BIG5HKSCSMappingTableSet [] ={ g_ASCIIMapping, g_utBig5HKSCSMapping, g_utBIG5Mapping, @@ -57,7 +57,7 @@ static PRUint16 *g_BIG5HKSCSMappingTableSet [] ={ g_utBig5HKSCSMapping, }; -static uRange g_BIG5HKSCSRanges[] = { +static const uRange g_BIG5HKSCSRanges[] = { { 0x00, 0x7E }, { 0x81, 0xA0 }, { 0xA1, 0xC6 }, diff --git a/mozilla/intl/uconv/ucvtw/nsBIG5ToUnicode.cpp b/mozilla/intl/uconv/ucvtw/nsBIG5ToUnicode.cpp index ac646cdf008..532ea042895 100644 --- a/mozilla/intl/uconv/ucvtw/nsBIG5ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvtw/nsBIG5ToUnicode.cpp @@ -27,27 +27,27 @@ // Global functions and data [declaration] -static PRInt16 g_BIG5ShiftTable[] = { +static const PRInt16 g_BIG5ShiftTable[] = { 0, u2BytesCharset, ShiftCell(0,0,0,0,0,0,0,0) }; -static PRInt16 g_ASCIIShiftTable[] = { +static const PRInt16 g_ASCIIShiftTable[] = { 0, u1ByteCharset, ShiftCell(0,0,0,0,0,0,0,0) }; -static PRInt16 *g_BIG5ShiftTableSet [] = { +static const PRInt16 *g_BIG5ShiftTableSet [] = { g_ASCIIShiftTable, g_BIG5ShiftTable }; -static PRUint16 *g_BIG5MappingTableSet [] ={ +static const PRUint16 *g_BIG5MappingTableSet [] ={ g_ASCIIMapping, g_utBIG5Mapping }; -static uRange g_BIG5Ranges[] = { +static const uRange g_BIG5Ranges[] = { { 0x00, 0x7E }, { 0x81, 0xFC } }; diff --git a/mozilla/intl/uconv/ucvtw/nsUnicodeToBIG5.cpp b/mozilla/intl/uconv/ucvtw/nsUnicodeToBIG5.cpp index 0aba00fc21c..ddf4a26b243 100644 --- a/mozilla/intl/uconv/ucvtw/nsUnicodeToBIG5.cpp +++ b/mozilla/intl/uconv/ucvtw/nsUnicodeToBIG5.cpp @@ -27,23 +27,23 @@ // Global functions and data [declaration] -static PRUint16 gAsciiShiftTable[] = { +static const PRUint16 gAsciiShiftTable[] = { 0, u1ByteCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRUint16 gBig5ShiftTable[] = { +static const PRUint16 gBig5ShiftTable[] = { 0, u2BytesCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRUint16 *g_Big5MappingTable[2] = { +static const PRUint16 *g_Big5MappingTable[2] = { g_ASCIIMapping, g_ufBig5Mapping }; -static PRUint16 *g_Big5ShiftTable[2] = { +static const PRUint16 *g_Big5ShiftTable[2] = { gAsciiShiftTable, gBig5ShiftTable }; diff --git a/mozilla/intl/uconv/ucvtw/nsUnicodeToBIG5HKSCS.cpp b/mozilla/intl/uconv/ucvtw/nsUnicodeToBIG5HKSCS.cpp index 1127896cb64..8404327d709 100644 --- a/mozilla/intl/uconv/ucvtw/nsUnicodeToBIG5HKSCS.cpp +++ b/mozilla/intl/uconv/ucvtw/nsUnicodeToBIG5HKSCS.cpp @@ -28,24 +28,24 @@ // Global functions and data [declaration] -static PRUint16 gAsciiShiftTable[] = { +static const PRUint16 gAsciiShiftTable[] = { 0, u1ByteCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRUint16 gBig5HKSCSShiftTable[] = { +static const PRUint16 gBig5HKSCSShiftTable[] = { 0, u2BytesCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRUint16 *g_Big5HKSCSMappingTable[] = { +static const PRUint16 *g_Big5HKSCSMappingTable[] = { g_ASCIIMapping, g_ufBig5Mapping, g_ufBig5HKSCSMapping }; -static PRUint16 *g_Big5HKSCSShiftTable[] = { +static const PRUint16 *g_Big5HKSCSShiftTable[] = { gAsciiShiftTable, gBig5HKSCSShiftTable, gBig5HKSCSShiftTable diff --git a/mozilla/intl/uconv/ucvtw/nsUnicodeToBIG5NoAscii.cpp b/mozilla/intl/uconv/ucvtw/nsUnicodeToBIG5NoAscii.cpp index bf14103ad6f..8a80730270c 100644 --- a/mozilla/intl/uconv/ucvtw/nsUnicodeToBIG5NoAscii.cpp +++ b/mozilla/intl/uconv/ucvtw/nsUnicodeToBIG5NoAscii.cpp @@ -26,7 +26,7 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRUint16 gBig5ShiftTable[] = { +static const PRUint16 gBig5ShiftTable[] = { 0, u2BytesCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; diff --git a/mozilla/intl/uconv/ucvtw/nsUnicodeToHKSCS.cpp b/mozilla/intl/uconv/ucvtw/nsUnicodeToHKSCS.cpp index 249cc81e457..c0152a01f28 100644 --- a/mozilla/intl/uconv/ucvtw/nsUnicodeToHKSCS.cpp +++ b/mozilla/intl/uconv/ucvtw/nsUnicodeToHKSCS.cpp @@ -29,17 +29,17 @@ -static PRUint16 gBig5HKSCSShiftTable[] = { +static const PRUint16 gBig5HKSCSShiftTable[] = { 0, u2BytesCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRUint16 *g_Big5HKSCSMappingTable[] = { +static const PRUint16 *g_Big5HKSCSMappingTable[] = { g_ufBig5HKSCSMapping }; -static PRUint16 *g_Big5HKSCSShiftTable[] = { +static const PRUint16 *g_Big5HKSCSShiftTable[] = { gBig5HKSCSShiftTable }; diff --git a/mozilla/intl/uconv/ucvtw2/nsEUCTWToUnicode.cpp b/mozilla/intl/uconv/ucvtw2/nsEUCTWToUnicode.cpp index d92603d2e6c..1c232aaad30 100644 --- a/mozilla/intl/uconv/ucvtw2/nsEUCTWToUnicode.cpp +++ b/mozilla/intl/uconv/ucvtw2/nsEUCTWToUnicode.cpp @@ -27,44 +27,44 @@ // Global functions and data [declaration] -static PRInt16 g_ASCIIShiftTable[] = { +static const PRInt16 g_ASCIIShiftTable[] = { 0, u1ByteCharset, ShiftCell(0,0,0,0,0,0,0,0) }; -static PRInt16 g_CNS1ShiftTable[] = { +static const PRInt16 g_CNS1ShiftTable[] = { 0, u2BytesGRCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRInt16 g_CNS2ShiftTable[] = { +static const PRInt16 g_CNS2ShiftTable[] = { 0, u2BytesGRPrefix8EA2Charset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRInt16 g_CNS3ShiftTable[] = { +static const PRInt16 g_CNS3ShiftTable[] = { 0, u2BytesGRPrefix8EA3Charset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRInt16 g_CNS4ShiftTable[] = { +static const PRInt16 g_CNS4ShiftTable[] = { 0, u2BytesGRPrefix8EA4Charset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRInt16 g_CNS5ShiftTable[] = { +static const PRInt16 g_CNS5ShiftTable[] = { 0, u2BytesGRPrefix8EA5Charset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRInt16 g_CNS6ShiftTable[] = { +static const PRInt16 g_CNS6ShiftTable[] = { 0, u2BytesGRPrefix8EA6Charset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRInt16 g_CNS7ShiftTable[] = { +static const PRInt16 g_CNS7ShiftTable[] = { 0, u2BytesGRPrefix8EA7Charset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRInt16 *g_EUCTWShiftTableSet [] = { +static const PRInt16 *g_EUCTWShiftTableSet [] = { g_ASCIIShiftTable, g_CNS1ShiftTable, g_CNS2ShiftTable, @@ -75,7 +75,7 @@ static PRInt16 *g_EUCTWShiftTableSet [] = { g_CNS7ShiftTable }; -static PRUint16 *g_EUCTWMappingTableSet [] ={ +static const PRUint16 *g_EUCTWMappingTableSet [] ={ g_ASCIIMappingTable, g_utCNS1MappingTable, g_utCNS2MappingTable, @@ -86,7 +86,7 @@ static PRUint16 *g_EUCTWMappingTableSet [] ={ g_utCNS7MappingTable }; -static uRange g_EUCTWRanges[] = { +static const uRange g_EUCTWRanges[] = { { 0x00, 0x7E }, { 0xA1, 0xFE }, { 0x8E, 0x8E }, diff --git a/mozilla/intl/uconv/ucvtw2/nsUnicodeToEUCTW.cpp b/mozilla/intl/uconv/ucvtw2/nsUnicodeToEUCTW.cpp index 22eb9297154..ffd081c7eaa 100644 --- a/mozilla/intl/uconv/ucvtw2/nsUnicodeToEUCTW.cpp +++ b/mozilla/intl/uconv/ucvtw2/nsUnicodeToEUCTW.cpp @@ -26,43 +26,43 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static PRInt16 g_ASCIIShiftTable[] = { +static const PRInt16 g_ASCIIShiftTable[] = { 0, u1ByteCharset, ShiftCell(0,0,0,0,0,0,0,0) }; -static PRInt16 g_CNS1ShiftTable[] = { +static const PRInt16 g_CNS1ShiftTable[] = { 0, u2BytesGRCharset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRInt16 g_CNS2ShiftTable[] = { +static const PRInt16 g_CNS2ShiftTable[] = { 0, u2BytesGRPrefix8EA2Charset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRInt16 g_CNS3ShiftTable[] = { +static const PRInt16 g_CNS3ShiftTable[] = { 0, u2BytesGRPrefix8EA3Charset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRInt16 g_CNS4ShiftTable[] = { +static const PRInt16 g_CNS4ShiftTable[] = { 0, u2BytesGRPrefix8EA4Charset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRInt16 g_CNS5ShiftTable[] = { +static const PRInt16 g_CNS5ShiftTable[] = { 0, u2BytesGRPrefix8EA5Charset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRInt16 g_CNS6ShiftTable[] = { +static const PRInt16 g_CNS6ShiftTable[] = { 0, u2BytesGRPrefix8EA6Charset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRInt16 g_CNS7ShiftTable[] = { +static const PRInt16 g_CNS7ShiftTable[] = { 0, u2BytesGRPrefix8EA7Charset, ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), }; -static PRInt16 *g_EUCTWShiftTableSet [] = { +static const PRInt16 *g_EUCTWShiftTableSet [] = { g_ASCIIShiftTable, g_CNS1ShiftTable, g_CNS2ShiftTable, @@ -73,7 +73,7 @@ static PRInt16 *g_EUCTWShiftTableSet [] = { g_CNS7ShiftTable }; -static PRUint16 *g_EUCTWMappingTableSet [] ={ +static const PRUint16 *g_EUCTWMappingTableSet [] ={ g_ASCIIMappingTable, g_ufCNS1MappingTable, g_ufCNS2MappingTable,