1737620 - Misc errors in unified builds prevent adding new files

Status: RESOLVED FIXED

(Core :: Widget: Cocoa, defect, P3)

Description

[Harry Twyford]

When working on bug 1525788, I got the build errors:

In file included from Unified_mm_widget_cocoa2.mm:119:
/Users/harry/Developer/mozilla/mozilla-unified/widget/cocoa/nsTouchBarInputIcon.mm:25:23: error: redefinition of 'kIconSize'
static const uint32_t kIconSize = 16;
^
/Users/harry/Developer/mozilla/mozilla-unified/widget/cocoa/nsMenuItemIconX.mm:42:23: note: previous definition is here
static const uint32_t kIconSize = 16;
^
In file included from Unified_mm_widget_cocoa3.mm:2:
In file included from /Users/harry/Developer/mozilla/mozilla-unified/widget/cocoa/nsWidgetFactory.mm:6:
In file included from /Users/harry/Developer/mozilla/mozilla-unified/objdir.noindex/dist/include/nsISupports.h:82:
In file included from /Users/harry/Developer/mozilla/mozilla-unified/objdir.noindex/dist/include/nsISupportsUtils.h:17:
/Users/harry/Developer/mozilla/mozilla-unified/objdir.noindex/dist/include/mozilla/RefPtr.h:49:37: error: member access into incomplete type 'mozilla::widget::NativeMenuMac'
static void AddRef(U* aPtr) { aPtr->AddRef(); }
^
/Users/harry/Developer/mozilla/mozilla-unified/objdir.noindex/dist/include/mozilla/RefPtr.h:380:61: note: in instantiation of member function 'mozilla::RefPtrTraits<mozilla::widget::NativeMenuMac>::AddRef' requested here
static void AddRef(U* aPtr) { mozilla::RefPtrTraits<U>::AddRef(aPtr); }
^
/Users/harry/Developer/mozilla/mozilla-unified/objdir.noindex/dist/include/mozilla/RefPtr.h:97:37: note: in instantiation of member function 'RefPtr<mozilla::widget::NativeMenuMac>::ConstRemovingRefPtrTraits<mozilla::widget::NativeMenuMac>::AddRef' requested here
ConstRemovingRefPtrTraits<T>::AddRef(mRawPtr);
^
/Users/harry/Developer/mozilla/mozilla-unified/widget/cocoa/nsStandaloneNativeMenu.h:22:67: note: in instantiation of member function 'RefPtr<mozilla::widget::NativeMenuMac>::RefPtr' requested here
RefPtr<mozilla::widget::NativeMenuMac> GetNativeMenu() { return mMenu; }
^
/Users/harry/Developer/mozilla/mozilla-unified/widget/cocoa/nsStandaloneNativeMenu.h:12:7: note: forward declaration of 'mozilla::widget::NativeMenuMac'
class NativeMenuMac;
^

These errors have to be fixed before I add new files in bug 1525788.

Comment 1

[Harry Twyford]

Attachment: Bug 1737620 - Fix misc errors in unified builds. r?mstange!

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/6dd3e3a4becf
Fix misc errors in unified builds. r=mstange

Comment 3

[Cosmin Sabou [:CosminS]]

https://hg.mozilla.org/mozilla-central/rev/6dd3e3a4becf