Avoid lvalue cast for GCC 3.4. Add DragonFly support.

This commit is contained in:
joerg 2005-12-19 19:38:55 +00:00
parent 57e047a852
commit eb1f14f871
4 changed files with 59 additions and 1 deletions

View file

@ -1,6 +1,9 @@
$NetBSD: distinfo,v 1.3 2005/10/31 18:58:38 tv Exp $
$NetBSD: distinfo,v 1.4 2005/12/19 19:38:55 joerg Exp $
SHA1 (licq-1.2.6.tar.bz2) = fef2d6d8c9a368313335f3ac0e86128aa24133ef
RMD160 (licq-1.2.6.tar.bz2) = fcb2e19bf7d30c1824392a9be3ea1619072e4ce5
Size (licq-1.2.6.tar.bz2) = 3282918 bytes
SHA1 (patch-aa) = 974a65e3483b3438fb3c6c9aaf96aa67e4c60fa6
SHA1 (patch-ab) = 6acfff2027ce5ed4c8fb7eddbdbc4b4a7617eea9
SHA1 (patch-ac) = 42471d386f95881244644e7207ab10e4baa4cafa
SHA1 (patch-ad) = e72e64bc4f70dafe632415b0175084656b8e85dd

View file

@ -0,0 +1,22 @@
$NetBSD: patch-ab,v 1.1 2005/12/19 19:38:55 joerg Exp $
--- src/socket.cpp.orig 2005-12-19 18:33:17.000000000 +0000
+++ src/socket.cpp
@@ -1012,7 +1012,7 @@ bool TCPSocket::SSL_Pending()
bool TCPSocket::SecureConnect()
{
pthread_mutex_init(&mutex_ssl, NULL);
- m_pSSL = SSL_new(gSSL_CTX);
+ m_p_SSL = SSL_new(gSSL_CTX);
#ifdef SSL_DEBUG
m_pSSL->debug = 1;
#endif
@@ -1045,7 +1045,7 @@ bool TCPSocket::SecureListen()
{
pthread_mutex_init(&mutex_ssl, NULL);
- m_pSSL = SSL_new(gSSL_CTX);
+ m_p_SSL = SSL_new(gSSL_CTX);
SSL_set_session(m_pSSL, NULL);
SSL_set_fd(m_pSSL, m_nDescriptor);
int i = SSL_accept(m_pSSL);

View file

@ -0,0 +1,16 @@
$NetBSD: patch-ac,v 1.1 2005/12/19 19:38:55 joerg Exp $
--- src/user.cpp.orig 2005-12-19 18:37:05.000000000 +0000
+++ src/user.cpp
@@ -2544,7 +2544,11 @@ ICQOwner::ICQOwner()
m_fConf.ReadBool("HideIP", m_bHideIp, false);
m_fConf.ReadNum("RCG", m_nRandomChatGroup, ICQ_RANDOMxCHATxGROUP_NONE);
m_fConf.ReadStr("AutoResponse", szTemp, "");
+#if defined(__DragonFly__)
+ { unsigned long tmp; m_fConf.ReadNum("SSTime", tmp, 0L); m_nSSTime = tmp; }
+#else
m_fConf.ReadNum("SSTime", (unsigned long)m_nSSTime, 0L);
+#endif
m_fConf.ReadNum("SSCount", m_nSSCount, 0);
SetAutoResponse(szTemp);

View file

@ -0,0 +1,17 @@
$NetBSD: patch-ad,v 1.1 2005/12/19 19:38:55 joerg Exp $
--- configure.orig 2003-03-23 22:21:31.000000000 +0000
+++ configure
@@ -4244,6 +4244,12 @@ case "$host" in
CXXFLAGS="$CXXFLAGS -pthread"
echo "Setting FreeBSD compilation options"
;;
+ *-*-dragonfly*)
+ CFLAGS="$CFLAGS -pthread"
+ CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
+ CXXFLAGS="$CXXFLAGS -pthread"
+ echo "Setting DragonFly compilation options"
+ ;;
*-*-solaris*)
CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DPIC -fPIC"
LDFLAGS="$LDFLAGS -mimpure-text"