From 67a2922875bf8f66e7a555d0424d8e7b320f5b5f Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Thu, 16 Oct 2008 11:49:44 +1300 Subject: [PATCH] Revert nsprpub configure micro-change in case that caused Windows bustage --- layout/reftests/bugs/411334-1-ref.xml | 2 +- layout/reftests/bugs/411334-1.xml | 2 +- layout/reftests/bugs/413286-1a.html | 4 ++-- layout/reftests/bugs/413286-1b.html | 4 ++-- layout/reftests/bugs/413286-1c.html | 4 ++-- layout/reftests/bugs/427370-1-ref.html | 11 +++++++---- layout/reftests/bugs/427370-1.html | 11 +++++++---- layout/reftests/bugs/430813-3-ref.html | 2 +- layout/reftests/bugs/430813-3.html | 2 +- nsprpub/configure | 2 +- 10 files changed, 25 insertions(+), 19 deletions(-) diff --git a/layout/reftests/bugs/411334-1-ref.xml b/layout/reftests/bugs/411334-1-ref.xml index d9e87b7ee68..8996ae0435d 100644 --- a/layout/reftests/bugs/411334-1-ref.xml +++ b/layout/reftests/bugs/411334-1-ref.xml @@ -1,6 +1,6 @@ -
+
W
diff --git a/layout/reftests/bugs/411334-1.xml b/layout/reftests/bugs/411334-1.xml index a64018a4170..91a4b3efa92 100644 --- a/layout/reftests/bugs/411334-1.xml +++ b/layout/reftests/bugs/411334-1.xml @@ -1,7 +1,7 @@ - W + W diff --git a/layout/reftests/bugs/413286-1a.html b/layout/reftests/bugs/413286-1a.html index 6743a039b61..7d14e65e11f 100644 --- a/layout/reftests/bugs/413286-1a.html +++ b/layout/reftests/bugs/413286-1a.html @@ -2,8 +2,8 @@ diff --git a/layout/reftests/bugs/413286-1b.html b/layout/reftests/bugs/413286-1b.html index 31ac0b6aa10..a0d00a393a9 100644 --- a/layout/reftests/bugs/413286-1b.html +++ b/layout/reftests/bugs/413286-1b.html @@ -2,8 +2,8 @@ diff --git a/layout/reftests/bugs/413286-1c.html b/layout/reftests/bugs/413286-1c.html index 34761884862..3781b689692 100644 --- a/layout/reftests/bugs/413286-1c.html +++ b/layout/reftests/bugs/413286-1c.html @@ -2,8 +2,8 @@ diff --git a/layout/reftests/bugs/427370-1-ref.html b/layout/reftests/bugs/427370-1-ref.html index cda7eda5f90..a53c5cd0eb3 100644 --- a/layout/reftests/bugs/427370-1-ref.html +++ b/layout/reftests/bugs/427370-1-ref.html @@ -43,6 +43,9 @@ direction:ltr; } + .C { + padding:0 0.2em 0 0.2em; + } @@ -56,7 +59,7 @@ Outside
  • -
    C
    +
    C
    • @@ -68,7 +71,7 @@ Outside
  • -
    C
    +
    C
    • @@ -83,7 +86,7 @@ Outside
  • -
    C
    +
    C
    • @@ -98,7 +101,7 @@ Outside
  • -
    C
    +
    C
    • diff --git a/layout/reftests/bugs/427370-1.html b/layout/reftests/bugs/427370-1.html index c5ce1684580..44c8bc5975e 100644 --- a/layout/reftests/bugs/427370-1.html +++ b/layout/reftests/bugs/427370-1.html @@ -43,6 +43,9 @@ direction:ltr; } + .C { + padding:0 0.2em 0 0.2em; + } @@ -56,7 +59,7 @@ Outside
  • -
    C
    +
    C
    • @@ -68,7 +71,7 @@ Outside
  • -
    C
    +
    C
    • @@ -83,7 +86,7 @@ Outside
  • -
    C
    +
    C
    • @@ -98,7 +101,7 @@ Outside
  • -
    C
    +
    C
    • diff --git a/layout/reftests/bugs/430813-3-ref.html b/layout/reftests/bugs/430813-3-ref.html index 656805e0e65..3303b954194 100644 --- a/layout/reftests/bugs/430813-3-ref.html +++ b/layout/reftests/bugs/430813-3-ref.html @@ -8,7 +8,7 @@
    text
    -This text should be near the top of the page, not pushed below the float. +This text should be near the top of the page, not pushed below the float.
    diff --git a/layout/reftests/bugs/430813-3.html b/layout/reftests/bugs/430813-3.html index c59dd616564..8225e979344 100644 --- a/layout/reftests/bugs/430813-3.html +++ b/layout/reftests/bugs/430813-3.html @@ -8,7 +8,7 @@
    text
    -This text should be near the top of the page, not pushed below the float. +This text should be near the top of the page, not pushed below the float.
    diff --git a/nsprpub/configure b/nsprpub/configure index 3d28c860ca4..65000d7401a 100755 --- a/nsprpub/configure +++ b/nsprpub/configure @@ -6016,7 +6016,7 @@ s%\[%\\&%g s%\]%\\&%g s%\$%$$%g EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' ' | tr '\015' ' '` rm -f conftest.defs