# HG changeset patch # User William Roberts # Date 1270754317 -3600 # Node ID d1bdfdf534bdf9c85907c07da094876d457855de # Parent a6dbc15ecf905ce635c34263747276b7e0a4b01e Add missing EXPORT_C in cpp files, and reinstate the DEF file additions, to fix Bug 2473 Mystery solved - RVCT 2.2 only exports functions on the basis of EXPORT_C, but RVCT 4.0 is triggered by the IMPORT_C as well diff -r a6dbc15ecf90 -r d1bdfdf534bd photosgallery/viewframework/commandhandlers/commandhandlerupnp/eabi/glxupnpcommandhandleru.def --- a/photosgallery/viewframework/commandhandlers/commandhandlerupnp/eabi/glxupnpcommandhandleru.def Thu Apr 08 18:19:32 2010 +0100 +++ b/photosgallery/viewframework/commandhandlers/commandhandlerupnp/eabi/glxupnpcommandhandleru.def Thu Apr 08 20:18:37 2010 +0100 @@ -3,4 +3,10 @@ _ZN15GlxUpnpRenderer6StatusEv @ 2 NONAME _ZN29CGlxCommandHandlerShowViaUpnp4NewLEP21MGlxMediaListProvideri @ 3 NONAME _ZN35CGlxCommandHandlerCopyToHomeNetwork4NewLER21MGlxMediaListProvider @ 4 NONAME + _ZN29CGlxCommandHandlerShowViaUpnpD0Ev @ 5 NONAME + _ZN29CGlxCommandHandlerShowViaUpnpD1Ev @ 6 NONAME + _ZN29CGlxCommandHandlerShowViaUpnpD2Ev @ 7 NONAME + _ZN35CGlxCommandHandlerCopyToHomeNetworkD0Ev @ 8 NONAME + _ZN35CGlxCommandHandlerCopyToHomeNetworkD1Ev @ 9 NONAME + _ZN35CGlxCommandHandlerCopyToHomeNetworkD2Ev @ 10 NONAME diff -r a6dbc15ecf90 -r d1bdfdf534bd photosgallery/viewframework/commandhandlers/commandhandlerupnp/src/glxcommandhandlercopytohomenetwork.cpp --- a/photosgallery/viewframework/commandhandlers/commandhandlerupnp/src/glxcommandhandlercopytohomenetwork.cpp Thu Apr 08 18:19:32 2010 +0100 +++ b/photosgallery/viewframework/commandhandlers/commandhandlerupnp/src/glxcommandhandlercopytohomenetwork.cpp Thu Apr 08 20:18:37 2010 +0100 @@ -84,7 +84,7 @@ //----------------------------------------------------------------------------------------- // Destructor //----------------------------------------------------------------------------------------- -CGlxCommandHandlerCopyToHomeNetwork::~CGlxCommandHandlerCopyToHomeNetwork() +EXPORT_C CGlxCommandHandlerCopyToHomeNetwork::~CGlxCommandHandlerCopyToHomeNetwork() { } diff -r a6dbc15ecf90 -r d1bdfdf534bd photosgallery/viewframework/commandhandlers/commandhandlerupnp/src/glxcommandhandlershowviaupnp.cpp --- a/photosgallery/viewframework/commandhandlers/commandhandlerupnp/src/glxcommandhandlershowviaupnp.cpp Thu Apr 08 18:19:32 2010 +0100 +++ b/photosgallery/viewframework/commandhandlers/commandhandlerupnp/src/glxcommandhandlershowviaupnp.cpp Thu Apr 08 20:18:37 2010 +0100 @@ -57,7 +57,7 @@ //----------------------------------------------------------------------------------------- // Destructor //----------------------------------------------------------------------------------------- -CGlxCommandHandlerShowViaUpnp::~CGlxCommandHandlerShowViaUpnp() +EXPORT_C CGlxCommandHandlerShowViaUpnp::~CGlxCommandHandlerShowViaUpnp() { //Do Nothing } diff -r a6dbc15ecf90 -r d1bdfdf534bd photosgallery/viewframework/medialists/eabi/glxmedialistsu.def --- a/photosgallery/viewframework/medialists/eabi/glxmedialistsu.def Thu Apr 08 18:19:32 2010 +0100 +++ b/photosgallery/viewframework/medialists/eabi/glxmedialistsu.def Thu Apr 08 20:18:37 2010 +0100 @@ -190,4 +190,9 @@ _ZTV34TGlxFromFocusOutwardBlockyIterator @ 189 NONAME _ZTV34TGlxFromIndexOutwardBlockyIterator @ 190 NONAME _ZTV40TGlxFromManualIndexOutwardBlockyIterator @ 191 NONAME + _ZNK12CGlxItemList18__DbgTestInvariantEv @ 192 NONAME + _ZNK14CGlxListWindow18__DbgTestInvariantEv @ 193 NONAME + _ZNK17CGlxNavigableList18__DbgTestInvariantEv @ 194 NONAME + _ZNK18CGlxStaticItemList18__DbgTestInvariantEv @ 195 NONAME + _ZNK9CGlxMedia18__DbgTestInvariantEv @ 196 NONAME diff -r a6dbc15ecf90 -r d1bdfdf534bd photosgallery/viewframework/medialists/src/glxitemlist.cpp --- a/photosgallery/viewframework/medialists/src/glxitemlist.cpp Thu Apr 08 18:19:32 2010 +0100 +++ b/photosgallery/viewframework/medialists/src/glxitemlist.cpp Thu Apr 08 20:18:37 2010 +0100 @@ -538,7 +538,7 @@ // --------------------------------------------------------------------------- // Test invariant // --------------------------------------------------------------------------- -void CGlxItemList::__DbgTestInvariant() const +EXPORT_C void CGlxItemList::__DbgTestInvariant() const { #ifdef _DEBUG diff -r a6dbc15ecf90 -r d1bdfdf534bd photosgallery/viewframework/medialists/src/glxlistwindow.cpp --- a/photosgallery/viewframework/medialists/src/glxlistwindow.cpp Thu Apr 08 18:19:32 2010 +0100 +++ b/photosgallery/viewframework/medialists/src/glxlistwindow.cpp Thu Apr 08 20:18:37 2010 +0100 @@ -732,7 +732,7 @@ // --------------------------------------------------------------------------- // Test invariant // --------------------------------------------------------------------------- -void CGlxListWindow::__DbgTestInvariant() const +EXPORT_C void CGlxListWindow::__DbgTestInvariant() const { TRACER("CGlxListWindow::__DbgTestInvariant"); diff -r a6dbc15ecf90 -r d1bdfdf534bd photosgallery/viewframework/medialists/src/glxmedia.cpp --- a/photosgallery/viewframework/medialists/src/glxmedia.cpp Thu Apr 08 18:19:32 2010 +0100 +++ b/photosgallery/viewframework/medialists/src/glxmedia.cpp Thu Apr 08 20:18:37 2010 +0100 @@ -984,7 +984,7 @@ // --------------------------------------------------------------------------- // Test invariant // --------------------------------------------------------------------------- -void CGlxMedia::__DbgTestInvariant() const +EXPORT_C void CGlxMedia::__DbgTestInvariant() const { TRACER("CGlxMedia::__DbgTestInvariant"); diff -r a6dbc15ecf90 -r d1bdfdf534bd photosgallery/viewframework/medialists/src/glxnavigablelist.cpp --- a/photosgallery/viewframework/medialists/src/glxnavigablelist.cpp Thu Apr 08 18:19:32 2010 +0100 +++ b/photosgallery/viewframework/medialists/src/glxnavigablelist.cpp Thu Apr 08 20:18:37 2010 +0100 @@ -924,7 +924,7 @@ // --------------------------------------------------------------------------- // Test invariant // --------------------------------------------------------------------------- -void CGlxNavigableList::__DbgTestInvariant() const +EXPORT_C void CGlxNavigableList::__DbgTestInvariant() const { TRACER( "CGlxNavigableList::__DbgTestInvariant"); diff -r a6dbc15ecf90 -r d1bdfdf534bd photosgallery/viewframework/medialists/src/glxstaticitemlist.cpp --- a/photosgallery/viewframework/medialists/src/glxstaticitemlist.cpp Thu Apr 08 18:19:32 2010 +0100 +++ b/photosgallery/viewframework/medialists/src/glxstaticitemlist.cpp Thu Apr 08 20:18:37 2010 +0100 @@ -720,7 +720,7 @@ // --------------------------------------------------------------------------- // Test invariant // --------------------------------------------------------------------------- -void CGlxStaticItemList::__DbgTestInvariant() const +EXPORT_C void CGlxStaticItemList::__DbgTestInvariant() const { TRACER( "CGlxStaticItemList::__DbgTestInvariant");