diff --git a/build/unix/abs2rel.pl b/build/unix/abs2rel.pl index 6a71f47cdc2c..55b928d476c3 100644 --- a/build/unix/abs2rel.pl +++ b/build/unix/abs2rel.pl @@ -1,5 +1,5 @@ -#!env perl - +#!env perl + # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 # @@ -35,33 +35,33 @@ # 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; +} + diff --git a/extensions/universalchardet/src/base/LangHebrewModel.cpp b/extensions/universalchardet/src/base/LangHebrewModel.cpp index 9113a7a0ac75..21e4d68a13d9 100644 --- a/extensions/universalchardet/src/base/LangHebrewModel.cpp +++ b/extensions/universalchardet/src/base/LangHebrewModel.cpp @@ -19,8 +19,8 @@ * Portions created by the Initial Developer are Copyright (C) 2005 * the Initial Developer. All Rights Reserved. * - * Contributor(s): - * Shoshannah Forbes + * Contributor(s): + * Shoshannah Forbes * Shy Shalom * * Alternatively, the contents of this file may be used under the terms of diff --git a/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp b/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp index 838904b050dc..de018b9bdf92 100644 --- a/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp +++ b/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp @@ -105,13 +105,13 @@ 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(); diff --git a/layout/style/xbl-marquee/xbl-marquee.css b/layout/style/xbl-marquee/xbl-marquee.css index eb639197326d..0c81e4d8e9ab 100644 --- 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 */ +} diff --git a/modules/lcms/include/icc34.h b/modules/lcms/include/icc34.h index 735d96a07e96..6ac4625a896b 100644 --- a/modules/lcms/include/icc34.h +++ b/modules/lcms/include/icc34.h @@ -212,9 +212,9 @@ typedef __int32_t icInt64Number[2]; #if defined(__sun) || defined(__hpux) || defined (__MINGW) || defined(__MINGW32__) -#if defined (__MINGW) || defined(__MINGW32__) -#include -#endif +#if defined (__MINGW) || defined(__MINGW32__) +#include +#endif typedef uint8_t icUInt8Number; diff --git a/toolkit/themes/winstripe/global/menulist-aero.css b/toolkit/themes/winstripe/global/menulist-aero.css index 8eabc01dd9fd..6d0ca0886fe7 100644 --- 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; +}