Author: axeld Date: 2009-10-29 13:31:02 +0100 (Thu, 29 Oct 2009) New Revision: 33826 Changeset: http://dev.haiku-os.org/changeset/33826/haiku Modified: haiku/trunk/src/servers/app/DefaultDecorator.cpp Log: * This should fix the GCC4 build. Modified: haiku/trunk/src/servers/app/DefaultDecorator.cpp =================================================================== --- haiku/trunk/src/servers/app/DefaultDecorator.cpp 2009-10-29 10:21:52 UTC (rev 33825) +++ haiku/trunk/src/servers/app/DefaultDecorator.cpp 2009-10-29 12:31:02 UTC (rev 33826) @@ -572,7 +572,7 @@ if (window == fWindow) continue; - char* debugSuffix = "... NOT!"; + const char* debugSuffix = "... NOT!"; if (window != NULL) { // There can be cases where the other window to which this @@ -1625,7 +1625,7 @@ DefaultDecorator::HighlightBorders(bool active, BRegion* dirty) { if (active) { - fFrameColors = fHighlightFrameColors; + memcpy(fFrameColors, fHighlightFrameColors, sizeof(fFrameColors)); } else if (IsFocus()) { fFrameColors[0] = fNonHighlightFrameColors[0]; fFrameColors[1] = fNonHighlightFrameColors[1];