1189247 - Windows bustage from bug 964828 in libgg

Status: RESOLVED FIXED

(Chat Core :: General, defect)

Description

[Patrick Cloke [:clokep]]

0:56.72 C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\io.h(326) : error C2375: 'gg_win32_close' : redefinition; different linkage
 0:56.72         c:\users\clokep\comm-central\mozilla\extensions\purple\libpurple\protocols\gg\lib\network.h(68) : see declaration of 'gg_win32_close'
 0:56.73
 0:56.75 In the directory  /c/Users/clokep/comm-central/obj-i686-pc-mingw32/extensions/purple/libpurple/protocols/gg
 0:56.75 The following command failed to execute properly:
 0:56.75 c:/Users/clokep/comm-central/obj-i686-pc-mingw32/_virtualenv/Scripts/python.exe -m mozbuild.action.cl cl -Focommon.obj -c -DHAVE_CONFIG_H -DPACKAGE="gg" -DVERSION="2.10.11" -DDISPLAY_VERSION="2.10.11" -DPURPLE_STATIC_PRPL -DGLIB_STATIC_COMPILATION -Dinline=__inline -DAB_CD=en-US -DNO_NSPR_10_SUPPORT -Ic:/Users/clokep/comm-central/mozilla/extensions/purple/libpurple/protocols/gg -I. -I../../../../../dist/include/libpurple -I../../../../../dist/include/glib -Ic:/Users/clokep/comm-central/mozilla/extensions/purple/libpurple/protocols/gg/lib -I../../../../../dist/include -Ic:/Users/clokep/comm-central/obj-i686-pc-mingw32/dist/include/nspr -Ic:/Users/clokep/comm-central/obj-i686-pc-mingw32/dist/include/nss -MD -FI ../../../../../dist/include/mozilla-config.h -DMOZILLA_CLIENT -TC -nologo -D_HAS_EXCEPTIONS=0 -W3 -Gy -arch:IA32 -FS -wd4244 -wd4267 -wd4819 -we4553 -DNDEBUG -DTRIMMED -Zi -UDEBUG -DNDEBUG -O1 -Oi -Oy -Fdgenerated.pdb c:/Users/clokep/comm-central/mozilla/extensions/purple/libpurple/protocols/gg/lib/common.c
 0:56.75 c:/Users/clokep/comm-central/mozilla/config/rules.mk:918: recipe for target 'common.obj' failed
 0:56.75 mozmake.EXE[4]: *** [common.obj] Error 1
 0:56.75 c:/Users/clokep/comm-central/mozilla/config/recurse.mk:71: recipe for target 'extensions/purple/libpurple/protocols/gg/target' failed
 0:56.75 mozmake.EXE[3]: *** [extensions/purple/libpurple/protocols/gg/target] Error 2
 0:56.76 c:/Users/clokep/comm-central/mozilla/config/recurse.mk:32: recipe for target 'compile' failed
 0:56.76 mozmake.EXE[2]: *** [compile] Error 2
 0:56.76 c:/Users/clokep/comm-central/mozilla/config/recurse.mk:130: recipefor target 'compile' failed
 0:56.76 mozmake.EXE[1]: *** [compile] Error 2
 0:56.76 c:/Users/clokep/comm-central/mozilla/config/rules.mk:549: recipe for target 'default' failed
 0:56.76 mozmake.EXE: *** [default] Error 2
2

Comment 1

[Patrick Cloke [:clokep]]

Attachment: WIP

Comment 2

[Patrick Cloke [:clokep]]

Attachment: sipe.diff

Oops, so there was actually a few errors here, some of which are fixed in the patch.

SIPE fails to build from nspr:
 1:31.07 mozmake.EXE[4]: *** No rule to make target '../../../../../config/external/nspr/nspr.lib', needed by 'sipe.lib.desc'.  Stop.
 1:31.07 c:/Users/clokep/comm-central/mozilla/config/recurse.mk:71: recipe for target 'extensions/purple/libpurple/protocols/sipe/target' failed
 1:31.08 mozmake.EXE[3]: *** [extensions/purple/libpurple/protocols/sipe/target] Error 2
 1:31.08 c:/Users/clokep/comm-central/mozilla/config/recurse.mk:32: recipe for target 'compile' failed
 1:31.08 mozmake.EXE[2]: *** [compile] Error 2
 1:31.08 c:/Users/clokep/comm-central/mozilla/config/recurse.mk:130: recipe for target 'compile' failed
 1:31.08 mozmake.EXE[1]: *** [compile] Error 2
 1:31.08 c:/Users/clokep/comm-central/mozilla/config/rules.mk:549: recipe for target 'default' failed
 1:31.08 mozmake.EXE: *** [default] Error 2

This was straightforward to fix.

Comment 3

[Patrick Cloke [:clokep]]

After fixing the SIPE issues, there's a gg failure:

 1:26.02 c:\users\clokep\comm-central\mozilla\extensions\purple\libpurple\protocols\gg\lib\network.h(81) : error C2054: expected '(' to follow 'inline'
 1:26.02 c:\users\clokep\comm-central\mozilla\extensions\purple\libpurple\protocols\gg\lib\network.h(82) : error C2085: 'gg_win32_init_network' : not in formal parameter list
 1:26.02 c:\users\clokep\comm-central\mozilla\extensions\purple\libpurple\protocols\gg\lib\network.h(82) : error C2143: syntax error : missing ';' before '{'
 1:26.02 c:\users\clokep\comm-central\mozilla\extensions\purple\libpurple\protocols\gg\lib\network.h(112) : error C2054: expected '(' to follow 'inline'

 1:26.04 c:\users\clokep\comm-central\mozilla\extensions\purple\libpurple\protocols\gg\lib\network.h(113) : error C2085: 'gg_fd_set_nonblocking' : not in formal parameter list
 1:26.04 c:\users\clokep\comm-central\mozilla\extensions\purple\libpurple\protocols\gg\lib\network.h(113) : error C2143: syntax error : missing ';' before '{'
 1:26.04 C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\io.h(326) : error C2375: 'gg_win32_close' : redefinition; different linkage
 1:26.04         c:\users\clokep\comm-central\mozilla\extensions\purple\libpurple\protocols\gg\lib\network.h(68) : see declaration of 'gg_win32_close'
 1:26.04 c:\users\clokep\comm-central\mozilla\extensions\purple\libpurple\protocols\gg\lib\internal.h(213) : error C2054: expected '(' to follow 'inline'
 1:26.04 c:\users\clokep\comm-central\mozilla\extensions\purple\libpurple\protocols\gg\lib\internal.h(214) : error C2085: 'gg_win32_hook_f' : not in formal parameter list
 1:26.04 c:\users\clokep\comm-central\mozilla\extensions\purple\libpurple\protocols\gg\lib\internal.h(214) : error C2143: syntax error : missing ';' before '{'
 1:26.04 c:\users\clokep\comm-central\mozilla\extensions\purple\libpurple\protocols\gg\lib\internal.h(247) : error C2054: expected '(' to follow 'inline'
 1:26.04 c:\users\clokep\comm-central\mozilla\extensions\purple\libpurple\protocols\gg\lib\internal.h(248) : error C2085: 'gg_win32_hook_set_enabled' :not in formal parameter list
 1:26.04 c:\users\clokep\comm-central\mozilla\extensions\purple\libpurple\protocols\gg\lib\internal.h(248) : error C2143: syntax error : missing ';' before '{'
 1:26.04 Warning: C4013 in c:\Users\clokep\comm-central\mozilla\extensions\purple\libpurple\protocols\gg\lib\common.c: 'gg_fd_set_nonblocking' undefined; assuming extern returning int
 1:26.05 c:/Users/clokep/comm-central/mozilla/extensions/purple/libpurple/pr
otocols/gg/lib/common.c(278) : warning C4013: 'gg_fd_set_nonblocking' undefined; assuming extern returning int
 1:26.05
 1:26.05 In the directory  /c/Users/clokep/comm-central/obj-i686-pc-mingw32/extensions/purple/libpurple/protocols/gg
 1:26.05 The following command failed to execute properly:
 1:26.05 c:/Users/clokep/comm-central/obj-i686-pc-mingw32/_virtualenv/Scripts/python.exe -m mozbuild.action.cl cl -Focommon.obj -c -DHAVE_CONFIG_H -DPACKAGE="gg" -DVERSION="2.10.11" -DDISPLAY_VERSION="2.10.11" -DPURPLE_STATIC_PRPL -DGLIB_STATIC_COMPILATION -DAB_CD=en-US -DNO_NSPR_10_SUPPORT -Ic:/Users/clokep/comm-central/mozilla/extensions/purple/libpurple/protocols/gg -I. -I../../../../../dist/include/libpurple -I../../../../../dist/include/glib -Ic:/Users/clokep/comm-central/mozilla/extensions/purple/libpurple/protocols/gg/lib -I../../../../../dist/include -Ic:/Users/clokep/comm-central/obj-i686-pc-mingw32/dist/include/nspr -Ic:/Users/clokep/comm-central/obj-i686-pc-mingw32/dist/include/nss -MD -FI ../../../../../dist/include/mozilla-config.h -DMOZILLA_CLIENT -TC -nologo -D_HAS_EXCEPTIONS=0 -W3 -Gy -arch:IA32 -FS -wd4244 -wd4267 -wd4819 -we4553 -DNDEBUG -DTRIMMED -Zi -UDEBUG -DNDEBUG -O1 -Oi -Oy -Fdgenerated.pdb c:/Users/clokep/comm-central/mozilla/extensions/purple/libpurple/protocols/gg/lib/common.c
 1:26.05 c:/Users/clokep/comm-central/mozilla/config/rules.mk:918: recipe for target 'common.obj' failed
 1:26.05 mozmake.EXE[4]: *** [common.obj] Error 1
 1:26.05 c:/Users/clokep/comm-central/mozilla/config/recurse.mk:71: recipe for target 'extensions/purple/libpurple/protocols/gg/target' failed
 1:26.05 mozmake.EXE[3]: *** [extensions/purple/libpurple/protocols/gg/target] Error 2
 1:26.05 c:/Users/clokep/comm-central/mozilla/config/recurse.mk:32: recipe for target 'compile' failed
 1:26.05 mozmake.EXE[2]: *** [compile] Error 2
 1:26.07 c:/Users/clokep/comm-central/mozilla/config/recurse.mk:130: recipefor target 'compile' failed
 1:26.07 mozmake.EXE[1]: *** [compile] Error 2
 1:26.07 c:/Users/clokep/comm-central/mozilla/config/rules.mk:549: recipe for target 'default' failed
 1:26.07 mozmake.EXE: *** [default] Error 2



This is fixed by adding the define to the moz.build file, you then get the errors in comment 0:
> if CONFIG['OS_TARGET'] == 'WINNT':
>     DEFINES['inline'] = '__inline'

Comment 4

[Patrick Cloke [:clokep]]

Attachment: Preprocessed file: network.i

We preprocessed the file with: mozmake -C obj-i686-pc-mingw32/extensions/purple/libpurple/protocols/gg/ lib/network.i

This is the result.

Comment 5

[Patrick Cloke [:clokep]]

Attachment: Patch v1

Some of this is reapplying fixes that we previously had (e.g. in the MSN code); I'm going to upstream these fixes so it doesn't happen again.

Comment 6

[Florian Quèze [:florian]]

Comment on attachment 8645667 [details] [diff] [review]
Patch v1

I haven't done a thorough review, but nothing scary here.

Comment 7

[Patrick Cloke [:clokep]]

Just going to do a quick build on Mac and then I'll check this in.

Comment 8

[Patrick Cloke [:clokep]]

https://hg.mozilla.org/users/florian_queze.net/purple/rev/cfb3392fcd20

I plan to file some upstream bugs on this at some point...

Comment 9

[Patrick Cloke [:clokep]]

Upstream Pidgin bug: https://developer.pidgin.im/ticket/16740

Comment 10

[Patrick Cloke [:clokep]]

And libgadu PR: https://github.com/wojtekka/libgadu/pull/18