diff --git a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp
index 069f8c454f6..6dc0deba402 100644
--- a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp
+++ b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp
@@ -585,7 +585,7 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths(nscoord aMaxWidth
         spanTotal -= spanCellSpacing;
         nscoord cellWidth = cellWidths[widthX] - spanCellSpacing;
         if ((cellWidth > 0) && !((widthX == MIN_CON) && (cellWidth <= spanTotal))) {
-          for (spanX = 0; spanX < colSpan; spanX++) {
+          for (PRInt32 spanX = 0; spanX < colSpan; spanX++) {
             nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX + spanX);
             nscoord colWidth = colFrame->GetWidth(widthX);
             nscoord minWidth = colFrame->GetMinWidth();
@@ -859,7 +859,7 @@ nscoord BasicTableLayoutStrategy::AssignPercentageColumnWidths(nscoord aBasisIn,
         }
         if (colPctWidthTotal < cellPctWidth) { 
           // record the percent contributions for the spanned cols
-          for (spanX = 0; spanX < colSpan; spanX++) {
+          for (PRInt32 spanX = 0; spanX < colSpan; spanX++) {
             nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX + spanX);
             if (colFrame->GetWidth(PCT) > 0) { // skip pct cols
               continue;
diff --git a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp
index 069f8c454f6..6dc0deba402 100644
--- a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp
+++ b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp
@@ -585,7 +585,7 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths(nscoord aMaxWidth
         spanTotal -= spanCellSpacing;
         nscoord cellWidth = cellWidths[widthX] - spanCellSpacing;
         if ((cellWidth > 0) && !((widthX == MIN_CON) && (cellWidth <= spanTotal))) {
-          for (spanX = 0; spanX < colSpan; spanX++) {
+          for (PRInt32 spanX = 0; spanX < colSpan; spanX++) {
             nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX + spanX);
             nscoord colWidth = colFrame->GetWidth(widthX);
             nscoord minWidth = colFrame->GetMinWidth();
@@ -859,7 +859,7 @@ nscoord BasicTableLayoutStrategy::AssignPercentageColumnWidths(nscoord aBasisIn,
         }
         if (colPctWidthTotal < cellPctWidth) { 
           // record the percent contributions for the spanned cols
-          for (spanX = 0; spanX < colSpan; spanX++) {
+          for (PRInt32 spanX = 0; spanX < colSpan; spanX++) {
             nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX + spanX);
             if (colFrame->GetWidth(PCT) > 0) { // skip pct cols
               continue;