Remove <CR>s (to fix cross-compilation bustage) rs=bsmedberg,gavin,roc,smontagu b=372802
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Sat, 20 Sep 2008 20:45:25 +0100
changeset 19465 d576ce1f70422c2503f4410b015d2c16e7328655
parent 19464 8fbe05371cc3e56e926a9066eb556bf1a05c0545
child 19466 352ba4e9d85c30b28aa5c087c5ff805aec782d84
push id2253
push userneil@parkwaycc.co.uk
push dateSat, 20 Sep 2008 19:45:43 +0000
treeherderautoland@d576ce1f7042 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg, gavin, roc, smontagu
bugs372802
milestone1.9.1b1pre
Remove <CR>s (to fix cross-compilation bustage) rs=bsmedberg,gavin,roc,smontagu b=372802
build/unix/abs2rel.pl
extensions/universalchardet/src/base/LangHebrewModel.cpp
extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp
layout/style/xbl-marquee/xbl-marquee.css
modules/lcms/include/icc34.h
toolkit/themes/winstripe/global/menulist-aero.css
--- a/build/unix/abs2rel.pl
+++ b/build/unix/abs2rel.pl
@@ -1,10 +1,10 @@
-#!env perl
-
+#!env perl
+
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/
 #
@@ -30,38 +30,38 @@
 # under the terms of either the GPL or the LGPL, and not to allow others to
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
-
-use File::Spec::Unix;
-use strict;
-
-print "Usage: $0 dest_path start_path\n" if ($#ARGV+1 != 2);
-my $finish = my_canonpath(shift);
-my $start = my_canonpath(shift);
-
-my $res = File::Spec::Unix->abs2rel($finish, $start);
-
-#print STDERR "abs2rel($finish,$start) = $res\n";
-print "$res\n";
-
-sub my_canonpath($) {
-    my ($file) = @_;
-    my (@inlist, @outlist, $dir);
-
-    # Do what File::Spec::Unix->no_upwards should do
-    my @inlist = split(/\//, File::Spec::Unix->canonpath($file));
-    foreach $dir (@inlist) {
-	if ($dir eq '..') {
-	    pop @outlist;
-	} else {
-	    push @outlist, $dir;
-	}
-    }
-    $file = join '/',@outlist;
-    return $file;
-}
-
+
+use File::Spec::Unix;
+use strict;
+
+print "Usage: $0 dest_path start_path\n" if ($#ARGV+1 != 2);
+my $finish = my_canonpath(shift);
+my $start = my_canonpath(shift);
+
+my $res = File::Spec::Unix->abs2rel($finish, $start);
+
+#print STDERR "abs2rel($finish,$start) = $res\n";
+print "$res\n";
+
+sub my_canonpath($) {
+    my ($file) = @_;
+    my (@inlist, @outlist, $dir);
+
+    # Do what File::Spec::Unix->no_upwards should do
+    my @inlist = split(/\//, File::Spec::Unix->canonpath($file));
+    foreach $dir (@inlist) {
+	if ($dir eq '..') {
+	    pop @outlist;
+	} else {
+	    push @outlist, $dir;
+	}
+    }
+    $file = join '/',@outlist;
+    return $file;
+}
+
--- a/extensions/universalchardet/src/base/LangHebrewModel.cpp
+++ b/extensions/universalchardet/src/base/LangHebrewModel.cpp
@@ -14,18 +14,18 @@
  *
  * The Original Code is Mozilla Universal charset detector code.
  *
  * The Initial Developer of the Original Code is
  *          Simon Montagu <smontagu@smontagu.org>
  * Portions created by the Initial Developer are Copyright (C) 2005
  * the Initial Developer. All Rights Reserved.
  *
- * Contributor(s):
- *          Shoshannah Forbes <xslf@xslf.com>
+ * Contributor(s):
+ *          Shoshannah Forbes <xslf@xslf.com>
  *          Shy Shalom <shooshX@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
--- a/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp
+++ b/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp
@@ -100,23 +100,23 @@ NS_IMETHODIMP nsXPCOMDetector::DoIt(cons
   *oDontFeedMe = PR_FALSE;
   return NS_OK;
 }
 //----------------------------------------------------------
 NS_IMETHODIMP nsXPCOMDetector::Done()
 {
   NS_ASSERTION(mObserver != nsnull , "have not init yet");
 #ifdef DEBUG_chardet
-  for (PRInt32 i = 0; i < NUM_OF_CHARSET_PROBERS; i++)
-  {
-    // If no data was received the array might stay filled with nulls
-    // the way it was initialized in the constructor.
-    if (mCharSetProbers[i])
-      mCharSetProbers[i]->DumpStatus();
-  }
+  for (PRInt32 i = 0; i < NUM_OF_CHARSET_PROBERS; i++)
+  {
+    // If no data was received the array might stay filled with nulls
+    // the way it was initialized in the constructor.
+    if (mCharSetProbers[i])
+      mCharSetProbers[i]->DumpStatus();
+  }
 #endif
 
   this->DataEnd();
   return NS_OK;
 }
 //----------------------------------------------------------
 void nsXPCOMDetector::Report(const char* aCharset)
 {
--- a/layout/style/xbl-marquee/xbl-marquee.css
+++ b/layout/style/xbl-marquee/xbl-marquee.css
@@ -1,44 +1,44 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* PRINT ONLY rules */
-@media print {
-
-  marquee > * > * { 
-    margin: 0 !important; 
-    padding: 0 !important;
-  } /* This hack is needed until bug 119078 gets fixed */
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/* PRINT ONLY rules */
+@media print {
+
+  marquee > * > * { 
+    margin: 0 !important; 
+    padding: 0 !important;
+  } /* This hack is needed until bug 119078 gets fixed */
+}
--- a/modules/lcms/include/icc34.h
+++ b/modules/lcms/include/icc34.h
@@ -207,19 +207,19 @@ typedef __int32_t       icInt64Number[2]
 
 #else   
 #if defined(__GNUC__) || defined(__unix__) || defined(__unix)
 
 #include <sys/types.h>
 
 #if defined(__sun) || defined(__hpux) || defined (__MINGW) || defined(__MINGW32__)
 
-#if defined (__MINGW) || defined(__MINGW32__)
-#include <stdint.h>
-#endif
+#if defined (__MINGW) || defined(__MINGW32__)
+#include <stdint.h>
+#endif
 
 
 typedef uint8_t   icUInt8Number;
 typedef uint16_t  icUInt16Number;
 typedef uint32_t  icUInt32Number;
 typedef uint32_t  icUInt64Number[2];
 
 #else
--- a/toolkit/themes/winstripe/global/menulist-aero.css
+++ b/toolkit/themes/winstripe/global/menulist-aero.css
@@ -1,8 +1,8 @@
-% include all of the Luna styles
-%include menulist.css
-
-menulist:focus > .menulist-label-box {
-  border: 1px dotted ThreeDDarkShadow;
-  background-color: transparent;
-  color: inherit;
-}
+% include all of the Luna styles
+%include menulist.css
+
+menulist:focus > .menulist-label-box {
+  border: 1px dotted ThreeDDarkShadow;
+  background-color: transparent;
+  color: inherit;
+}