Re: [Wireshark-dev] Windows Buildbot failing on emem.c after recent changes
Anders Broman wrote: Hi, The buildbot is failing. I'm not sure which of the recent changes that caused this. Indeed. I think it was r21330, by Sebastien: http://anonsvn.wireshark.org/viewvc/viewvc.py?view=revrevision=21330 Specifically, this bit: http://anonsvn.wireshark.org/viewvc/viewvc.py/trunk/epan/nstime.h?r1=21330r2=21329pathrev=21330 I think it's actually failing to build epan.c, which includes proto.h, which includes frame_data.h, which includes nstime.h, which now includes wtap.h, which includes winsock2.h, which has conflicting definitions with the winsock.h dragged in from somewhere else. At least, that's my best guess, currently. The question really is where the #include of winsock.h is coming from. I'll have to defer to someone with Win32 knowledge on that... ___ Wireshark-dev mailing list Wireshark-dev@wireshark.org http://www.wireshark.org/mailman/listinfo/wireshark-dev
Re: [Wireshark-dev] Windows Buildbot failing on emem.c after recent changes
Richard van der Hoff wrote: Anders Broman wrote: Hi, The buildbot is failing. I'm not sure which of the recent changes that caused this. Indeed. I think it was r21330, by Sebastien: http://anonsvn.wireshark.org/viewvc/viewvc.py?view=revrevision=21330 Specifically, this bit: http://anonsvn.wireshark.org/viewvc/viewvc.py/trunk/epan/nstime.h?r1=21330r2=21329pathrev=21330 I think it's actually failing to build epan.c, which includes proto.h, which includes frame_data.h, which includes nstime.h, which now includes wtap.h, which includes winsock2.h, which has conflicting definitions with the winsock.h dragged in from somewhere else. At least, that's my best guess, currently. The question really is where the #include of winsock.h is coming from. I'll have to defer to someone with Win32 knowledge on that... It's coming from the include of windows.h. Moving the #ifdef _WIN32 block down to below the other includes fixes it as including winsock2.h first will stop the winsock.h attempting to redefine things. Another similar occurrence is in gui_utils.c. I've checked in fixes in r21335. -- Regards, Graham Bloice ___ Wireshark-dev mailing list Wireshark-dev@wireshark.org http://www.wireshark.org/mailman/listinfo/wireshark-dev
[Wireshark-dev] Windows Buildbot failing on emem.c after recent changes
Hi, The buildbot is failing. I'm not sure which of the recent changes that caused this. Best regards Anders emem.c C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(99) : error C2011: 'fd_set' : 'struct' type redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(134) : warning C4005: 'FD_SET' : macro redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(83) : see previous definition of 'FD_SET' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(143) : error C2011: 'timeval' : 'struct' type redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(199) : error C2011: 'hostent' : 'struct' type redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(212) : error C2011: 'netent' : 'struct' type redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(219) : error C2011: 'servent' : 'struct' type redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(226) : error C2011: 'protoent' : 'struct' type redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(310) : error C2011: 'in_addr' : 'struct' type redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(368) : error C2011: 'sockaddr_in' : 'struct' type redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(378) : error C2011: 'WSAData' : 'struct' type redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(430) : warning C4005: 'SO_DONTLINGER' : macro redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(391) : see previous definition of 'SO_DONTLINGER' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(483) : warning C4005: 'AF_IPX' : macro redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(449) : see previous definition of 'AF_IPX' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(506) : warning C4005: 'AF_MAX' : macro redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(468) : see previous definition of 'AF_MAX' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(512) : error C2011: 'sockaddr' : 'struct' type redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(521) : error C2011: 'sockproto' : 'struct' type redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(560) : error C2011: 'linger' : 'struct' type redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(573) : warning C4005: 'SOMAXCONN' : macro redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(533) : see previous definition of 'SOMAXCONN' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(598) : warning C4005: 'FD_READ' : macro redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(551) : see previous definition of 'FD_READ' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(601) : warning C4005: 'FD_WRITE' : macro redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(552) : see previous definition of 'FD_WRITE' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(604) : warning C4005: 'FD_OOB' : macro redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(553) : see previous definition of 'FD_OOB' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(607) : warning C4005: 'FD_ACCEPT' : macro redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(554) : see previous definition of 'FD_ACCEPT' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(610) : warning C4005: 'FD_CONNECT' : macro redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(555) : see previous definition of 'FD_CONNECT' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(613) : warning C4005: 'FD_CLOSE' : macro redefinition C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(556) : see previous definition of 'FD_CLOSE' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(1427) : error C2375: 'accept' : redefinition; different linkage C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(707) : see declaration of 'accept' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(1448) : error C2375: 'bind' : redefinition; different linkage C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(710) : see declaration of 'bind' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(1467) : error C2375: 'closesocket' : redefinition; different linkage C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(712) : see declaration of 'closesocket' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(1486) : error C2375: 'connect' : redefinition; different linkage C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(714) : see declaration of 'connect' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(1507) : error C2375: 'ioctlsocket' : redefinition; different linkage C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(716) : see declaration of 'ioctlsocket' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(1528) : error C2375: 'getpeername' : redefinition; different linkage C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(718) : see declaration of 'getpeername' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(1549) : error C2375: 'getsockname' : redefinition; different linkage C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock.h(721) : see declaration of 'getsockname' C:\PROGRA~1\MICROS~2\VC98\INCLUDE\winsock2.h(1572) : error C2375:
