0.6.2-DR0 in CVS

Rimok · #15 07-25-2005, 06:01 AM

I still get errors compiling the files we add from common.

Sample is :

--------------------Configuration: World - Win32 Release--------------------
Compiling...
EQChatPacket.cpp
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(49) : error C2011: 'fd_set' : 'struct' type redefinition
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(83) : note C6311: C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock2.h(134) : see previous definition of 'FD_SET'
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(92) : error C2011: 'timeval' : 'struct' type redefinition
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(14

: error C2011: 'hostent' : 'struct' type redefinition
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(161) : error C2011: 'netent' : 'struct' type redefinition
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(16

: error C2011: 'servent' : 'struct' type redefinition
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(175) : error C2011: 'protoent' : 'struct' type redefinition
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(259) : error C2011: 'in_addr' : 'struct' type redefinition
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(309) : error C2011: 'sockaddr_in' : 'struct' type redefinition
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(319) : error C2011: 'WSAData' : 'struct' type redefinition
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(391) : note C6311: C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock2.h(430) : see previous definition of 'SO_DONTLINGER'
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(449) : note C6311: C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock2.h(483) : see previous definition of 'AF_IPX'
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(46

: note C6311: C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock2.h(506) : see previous definition of 'AF_MAX'
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(474) : error C2011: 'sockaddr' : 'struct' type redefinition
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(483) : error C2011: 'sockproto' : 'struct' type redefinition
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(520) : error C2011: 'linger' : 'struct' type redefinition
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(533) : note C6311: C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock2.h(573) : see previous definition of 'SOMAXCONN'
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(551) : note C6311: C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock2.h(59

: see previous definition of 'FD_READ'
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(552) : note C6311: C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock2.h(601) : see previous definition of 'FD_WRITE'
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(553) : note C6311: C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock2.h(604) : see previous definition of 'FD_OOB'
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(554) : note C6311: C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock2.h(607) : see previous definition of 'FD_ACCEPT'
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(555) : note C6311: C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock2.h(610) : see previous definition of 'FD_CONNECT'
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(556) : note C6311: C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock2.h(613) : see previous definition of 'FD_CLOSE'
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winsock.h(829) : error C2011: '_TRANSMIT_FILE_BUFFERS' : 'struct' type redefinition
Error executing cl.exe.

EQChatPacket.obj - 13 error(s), 0 warning(s)

Now it looks like part of the project is using winsock.h and part is using winsock2.h... I can't seem to find the files that need changing. I found a couple references to winsock2.h and changed em to winsock.h and still no-go. Ans I do not have a perl/* subtree.

Thanks.