Bug 1092130 - Fixed build errors found by mingw after bug 1076698 landed (-Werror=missing-braces errors). r=cpearce

This commit is contained in:
Jacek Caban 2014-11-03 10:28:52 +01:00
parent 55e8332dde
commit 1fb284960f
8 changed files with 13 additions and 13 deletions

View File

@ -98,7 +98,7 @@ ParseMP3Headers(MP3FrameParser *aParser, MediaResource *aResource)
// Windows XP's MP3 decoder filter. This is available on XP only, on Vista
// and later we can use the DMO Wrapper filter and MP3 decoder DMO.
static const GUID CLSID_MPEG_LAYER_3_DECODER_FILTER =
{ 0x38BE3000, 0xDBF4, 0x11D0, 0x86, 0x0E, 0x00, 0xA0, 0x24, 0xCF, 0xEF, 0x6D };
{ 0x38BE3000, 0xDBF4, 0x11D0, {0x86, 0x0E, 0x00, 0xA0, 0x24, 0xCF, 0xEF, 0x6D} };
nsresult
DirectShowReader::ReadMetadata(MediaInfo* aInfo,

View File

@ -29,7 +29,7 @@ struct GuidToName {
#pragma push_macro("OUR_GUID_ENTRY")
#undef OUR_GUID_ENTRY
#define OUR_GUID_ENTRY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
{ #name, {l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8} },
{ #name, {l, w1, w2, {b1, b2, b3, b4, b5, b6, b7, b8}} },
static const GuidToName GuidToNameTable[] = {
#include <uuids.h>

View File

@ -174,7 +174,7 @@ cairo_d2d_create_device_from_d3d10device(ID3D10Device1 *d3d10device)
};
D3D10_PASS_DESC passDesc;
ID3D10EffectTechnique *technique;
Vertex vertices[] = { {0.0, 0.0}, {1.0, 0.0}, {0.0, 1.0}, {1.0, 1.0} };
Vertex vertices[] = { {{0.0, 0.0}}, {{1.0, 0.0}}, {{0.0, 1.0}}, {{1.0, 1.0}} };
CD3D10_BUFFER_DESC bufferDesc(sizeof(vertices), D3D10_BIND_VERTEX_BUFFER);
D3D10_SUBRESOURCE_DATA data;
CD3D10_TEXTURE2D_DESC textDesc(DXGI_FORMAT_B8G8R8A8_UNORM,

View File

@ -71,7 +71,7 @@ namespace D2D1
D2D1_LAYER_OPTIONS1 layerOptions = D2D1_LAYER_OPTIONS1_NONE
)
{
D2D1_LAYER_PARAMETERS1 layerParameters = { 0 };
D2D1_LAYER_PARAMETERS1 layerParameters = {{ 0 }};
layerParameters.contentBounds = contentBounds;
layerParameters.geometricMask = geometricMask;

View File

@ -190,7 +190,7 @@ LayerManagerD3D10::Initialize(bool force, HRESULT* aHresultPtr)
attachments->mInputLayout = mInputLayout;
Vertex vertices[] = { {0.0, 0.0}, {1.0, 0.0}, {0.0, 1.0}, {1.0, 1.0} };
Vertex vertices[] = { {{0.0, 0.0}}, {{1.0, 0.0}}, {{0.0, 1.0}}, {{1.0, 1.0}} };
CD3D10_BUFFER_DESC bufferDesc(sizeof(vertices), D3D10_BIND_VERTEX_BUFFER);
D3D10_SUBRESOURCE_DATA data;
data.pSysMem = (void*)vertices;

View File

@ -169,7 +169,7 @@ CompositorD3D11::Initialize()
return false;
}
Vertex vertices[] = { {0.0, 0.0}, {1.0, 0.0}, {0.0, 1.0}, {1.0, 1.0} };
Vertex vertices[] = { {{0.0, 0.0}}, {{1.0, 0.0}}, {{0.0, 1.0}}, {{1.0, 1.0}} };
CD3D11_BUFFER_DESC bufferDesc(sizeof(vertices), D3D11_BIND_VERTEX_BUFFER);
D3D11_SUBRESOURCE_DATA data;
data.pSysMem = (void*)vertices;

View File

@ -324,7 +324,7 @@ class HighResNowSingleton {
private:
// Synchronize the QPC clock with GetSystemTimeAsFileTime.
void InitializeClock() {
LARGE_INTEGER ticks_per_sec = {0};
LARGE_INTEGER ticks_per_sec = {{0}};
if (!QueryPerformanceFrequency(&ticks_per_sec))
return; // Broken, we don't guarantee this function works.
ticks_per_microsecond_ = static_cast<float>(ticks_per_sec.QuadPart) /

View File

@ -565,14 +565,14 @@ TimeStamp::ComputeProcessUptime()
return 0;
}
ULARGE_INTEGER startUsec = {
start.dwLowDateTime,
start.dwHighDateTime
};
ULARGE_INTEGER nowUsec = {
ULARGE_INTEGER startUsec = {{
start.dwLowDateTime,
start.dwHighDateTime
}};
ULARGE_INTEGER nowUsec = {{
now.dwLowDateTime,
now.dwHighDateTime
};
}};
return (nowUsec.QuadPart - startUsec.QuadPart) / 10ULL;
}