--- a/layout/painting/FrameLayerBuilder.h+++ b/layout/painting/FrameLayerBuilder.h@@ -485,18 +485,17 @@ class FrameLayerBuilder : public layers: * properties we can animate on layers and calls |aCallback| * with the animation generation for the layer. If there is no corresponding * layer for the display item or the layer has no animation, the animation * generation is Nothing(). * * The enumeration stops if |aCallback| returns false. */ static void EnumerateGenerationForDedicatedLayers(- const nsIFrame* aFrame,- const AnimationGenerationCallback& aCallback);+ const nsIFrame* aFrame, const AnimationGenerationCallback& aCallback); /** * This callback must be provided to EndTransaction. The callback data * must be the nsDisplayListBuilder containing this FrameLayerBuilder. * This function can be called multiple times in a row to draw * different regions. This will occur when, for example, progressive paint is * enabled. In these cases aDirtyRegion can be used to specify a larger region * than aRegionToDraw that will be drawn during the transaction, possibly

--- a/mozglue/misc/Debug.h+++ b/mozglue/misc/Debug.h@@ -12,23 +12,23 @@ * e.g. mozglue, browser/app * * NB: printf_stderr() is in the global namespace, so include this file with * care; avoid including from header files. */ #include <io.h> #if defined(XP_WIN)-#include <windows.h>+# include <windows.h> #endif // defined(XP_WIN) #include "mozilla/Attributes.h" #include "mozilla/Sprintf.h" #if defined(MOZILLA_INTERNAL_API)-#error Do not include this file from XUL sources.+# error Do not include this file from XUL sources. #endif // Though this is a separate implementation than nsDebug's, we want to make the // declarations compatible to avoid confusing the linker if both headers are // included. #ifdef __cplusplus extern "C" { #endif // __cplusplus