tags 332513 +patch
thanks
The attached patch fixes this as well as some other FTBFS problems
including the 64bit issues from #332776.
Regards
Andreas Jochens
diff -urN ../tmp-orig/libassa-3.3.2/assa/Connector.h ./assa/Connector.h
--- ../tmp-orig/libassa-3.3.2/assa/Connector.h 2005-04-16 13:51:18.000000000
+0000
+++ ./assa/Connector.h 2005-11-01 10:26:51.000000000 +0000
@@ -406,7 +406,7 @@
int error;
int ret;
error = ret = errno = 0;
- size_t n = sizeof (error);
+ socklen_t n = sizeof (error);
/** Always remove IO handler first.
*/
diff -urN ../tmp-orig/libassa-3.3.2/assa/IPv4Socket.cpp ./assa/IPv4Socket.cpp
--- ../tmp-orig/libassa-3.3.2/assa/IPv4Socket.cpp 2005-04-16
13:51:18.000000000 +0000
+++ ./assa/IPv4Socket.cpp 2005-11-01 10:24:40.000000000 +0000
@@ -151,7 +151,7 @@
are not guaranteed to be aligned correctly!!!
*/
trace_with_mask("IPv4Socket::accept",SOCKTRACE);
- size_t length = 0;
+ socklen_t length = 0;
int new_fd = -1;
SA* remote_address;
diff -urN ../tmp-orig/libassa-3.3.2/assa/Reactor.cpp ./assa/Reactor.cpp
--- ../tmp-orig/libassa-3.3.2/assa/Reactor.cpp 2005-04-16 13:51:18.000000000
+0000
+++ ./assa/Reactor.cpp 2005-11-01 10:25:27.000000000 +0000
@@ -118,8 +118,8 @@
msg << " EXCEPT_EVENT";
}
msg << std::ends;
- DL((REACT,"Registered EventHandler 0x%x FD (%d) for event(s) %s\n",
- int(eh_), fd_, msg.str ().c_str () ));
+ DL((REACT,"Registered EventHandler 0x%lx FD (%d) for event(s) %s\n",
+ long(eh_), fd_, msg.str ().c_str () ));
if ( m_maxfd < fd_+1 ) {
m_maxfd = fd_+1;
@@ -193,7 +193,7 @@
else if ( m_exceptSet[fd_] ) eh = m_exceptSet[fd_];
if (eh) {
- DL((REACT,"Found EvtHandler 0x%x\n",int(eh) ));
+ DL((REACT,"Found EvtHandler 0x%lx\n",long(eh) ));
eh->handle_close (fd_);
}
diff -urN ../tmp-orig/libassa-3.3.2/assa/SigHandlersList.h
./assa/SigHandlersList.h
--- ../tmp-orig/libassa-3.3.2/assa/SigHandlersList.h 2005-04-16
13:51:18.000000000 +0000
+++ ./assa/SigHandlersList.h 2005-11-01 10:24:11.000000000 +0000
@@ -69,7 +69,7 @@
struct CompSHL {
bool operator () (const key_type c1_, const key_type c2_) const
{
- return int(c1_) < int(c2_);
+ return long(c1_) < long(c2_);
}
};
diff -urN ../tmp-orig/libassa-3.3.2/assa/Socket.cpp ./assa/Socket.cpp
--- ../tmp-orig/libassa-3.3.2/assa/Socket.cpp 2005-04-16 13:51:18.000000000
+0000
+++ ./assa/Socket.cpp 2005-11-01 10:25:59.000000000 +0000
@@ -194,7 +194,7 @@
int level = SOL_SOCKET;
bool bin = false;
- size_t len = sizeof (optval);
+ socklen_t len = sizeof (optval);
int ret;
if (rcvlowat == opt_) optname = SO_RCVLOWAT;
diff -urN ../tmp-orig/libassa-3.3.2/assa/UnConUDPSocket.cpp
./assa/UnConUDPSocket.cpp
--- ../tmp-orig/libassa-3.3.2/assa/UnConUDPSocket.cpp 2005-04-16
13:51:18.000000000 +0000
+++ ./assa/UnConUDPSocket.cpp 2005-11-01 10:26:33.000000000 +0000
@@ -34,7 +34,7 @@
// recvfrom() returns zeroed out address structure!!!
int len;
- size_t pa_len = peer_addr_->getLength();
+ socklen_t pa_len = peer_addr_->getLength();
SA* pa = peer_addr_->getAddress();
len = ::recvfrom(getHandler(), buf_, size_, 0, pa, &pa_len);
diff -urN ../tmp-orig/libassa-3.3.2/tests/genserver_test.cpp
./tests/genserver_test.cpp
--- ../tmp-orig/libassa-3.3.2/tests/genserver_test.cpp 2005-04-16
13:51:19.000000000 +0000
+++ ./tests/genserver_test.cpp 2005-11-01 10:28:22.000000000 +0000
@@ -199,7 +199,7 @@
DL((TRACE,"Initial command-line arguments:\n"));
for (i = 0; argv[i]; i++) {
- DL((TRACE,"[%d] - [%s], addr 0X%x\n", i, argv[i],
int(argv[i])));
+ DL((TRACE,"[%d] - [%s], addr 0X%lx\n", i, argv[i], long
(argv[i])));
}
SERVER->set_version (release, patch_level);
@@ -209,7 +209,7 @@
SERVER->init (&argc, argv, help_msg);
for (i = 0; argv [i]; i++) {
- DL((TRACE,"[%d] - [%s], addr 0X%x\n", i, argv [i], int (argv
[i])));
+ DL((TRACE,"[%d] - [%s], addr 0X%lx\n", i, argv [i], long (argv
[i])));
}
SERVER->initServer ();
diff -urN ../tmp-orig/libassa-3.3.2/tests/ttcp_assa.cpp ./tests/ttcp_assa.cpp
--- ../tmp-orig/libassa-3.3.2/tests/ttcp_assa.cpp 2005-04-16
13:51:19.000000000 +0000
+++ ./tests/ttcp_assa.cpp 2005-11-01 10:29:28.000000000 +0000
@@ -273,7 +273,7 @@
err("malloc");
if (bufalign != 0)
- buf +=(bufalign - ((int)buf % bufalign) + bufoffset) % bufalign;
+ buf +=(bufalign - ((long)buf % bufalign) + bufoffset) % bufalign;
if (trans) {
fprintf(stdout,
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
