[PATCH] Replacing '__LOADONCALLAPI' with 'SAL_CALL' definition

[Christos Strubulis]

Hi,
ok thank you for your advice and guidelines. 

I haven't deleted helpcontent2 yet but I will do it before the
next autogen and compilation. 

Would you like to have a look at the attached patch? What is
your opinion now?

Christos.

On Mon, 2012-12-10 at 13:24 +0100, Lubos Lunak wrote:
> On Sunday 09 of December 2012, Christos Strubulis wrote:
> > Ok thanks. I thought that this command would commit to the official
> > repository and not locally.
> >
> > Is this right now?
> 
>  Yes, that's right. There are still two minor issues with the patch though:
> 
> - your email in the commit is invalid ( "Christos Strubulis <strubul at ubuntu.
> (none)>"), see e.g. 
> https://help.github.com/articles/setting-your-email-in-git for how to fix it
> 
> - SAL_CALL is already defined in sal/inc/sal/types.h , so there's no need to 
> define it again in tools/inc/tools/solar.h , the definition of 
> __LOADONCALLAPI should be simply removed there
> 
>  Can you submit a new patch with these changes? Doing the solar.h change 
> and 'git commit -a --amend --reset-author'  should alter the already existing 
> commit you've already made. Thanks. I'll push the patch afterwards.
> 
> PS: In the patch there's also a line about the helpcontent2 git subrepository, 
> meaning that it's probably out of date. You need to either do 'git submodule 
> update' after each 'git pull -r' ('./g pull -r' in the toplevel dir does that 
> automatically), or delete helpcontent2 and pass --without-help to autogen.sh 
> to avoid using it.
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Replacing-__LOADONCALLAPI-with-SAL_CALL-definition.patch
Type: text/x-patch
Size: 32283 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20121210/6d53e81e/attachment-0001.bin>