945588 - SkConfig8888.h:44:20: error: redefinition of 'SkCopyBitmapToConfig8888' when building with 12 unified sources instead of 16

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Mike Hommey [:glandium]]

Open python/mozbuild/mozbuild/backend/recursivemake.py, search for files_per_unification, replace its value (16) with 12.

This is the (one of the multiple) error(s) you can get then:

gfx/skia/src/core/SkConfig8888.h:44:20: error: redefinition of 'SkCopyBitmapToConfig8888'
static inline void SkCopyBitmapToConfig8888(uint32_t* dstPixels,
                   ^
gfx/skia/src/core/SkConfig8888.h:44:20: note: previous definition is here
static inline void SkCopyBitmapToConfig8888(uint32_t* dstPixels,
                   ^
In file included from obj-x86_64-unknown-linux-gnu/gfx/skia/Unified_cpp_gfx_skia2.cpp:83:
In file included from gfx/skia/src/core/SkDevice.cpp:247:
gfx/skia/src/core/SkConfig8888.h:62:20: error: redefinition of 'SkCopyConfig8888ToBitmap'
static inline void SkCopyConfig8888ToBitmap(const SkBitmap& dstBmp,
                   ^
gfx/skia/src/core/SkConfig8888.h:62:20: note: previous definition is here
static inline void SkCopyConfig8888ToBitmap(const SkBitmap& dstBmp,

Comment 1

[(no longer active)]

Attachment: Add include guards to SkConfig8888.h

Comment 2

[George Wright (:gw280) (needinfo me!)]

Comment on attachment 8341679 [details] [diff] [review]
Add include guards to SkConfig8888.h

Please add a .patch file to the patches directory

Comment 3

[(no longer active)]

Done. http://hg.mozilla.org/integration/mozilla-inbound/rev/d48872b9112c

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/d48872b9112c