--- ./src/licq.conf.h Tue Feb 11 15:15:15 2003 +++ ../licq-1.2.6/./src/licq.conf.h Tue Mar 25 14:40:22 2003 @@ -36,12 +36,12 @@ "[onevent]\n" "Enable = 1\n" "Command = play\n" -"Message = /usr/share/licq/sounds/icq/Message.wav\n" -"Chat = /usr/share/licq/sounds/icq/Chat.wav\n" -"File = /usr/share/licq/sounds/icq/File.wav\n" -"Url = /usr/share/licq/sounds/icq/URL.wav\n" -"OnlineNotify = /usr/share/licq/sounds/icq/Notify.wav\n" -"SysMsg = /usr/share/licq/sounds/icq/System.wav\n" +"Message = /usr/freeware/share/licq/sounds/icq/Message.wav\n" +"Chat = /usr/freeware/share/licq/sounds/icq/Chat.wav\n" +"File = /usr/freeware/share/licq/sounds/icq/File.wav\n" +"Url = /usr/freeware/share/licq/sounds/icq/URL.wav\n" +"OnlineNotify = /usr/freeware/share/licq/sounds/icq/Notify.wav\n" +"SysMsg = /usr/freeware/share/licq/sounds/icq/System.wav\n" "\n" "[groups]\n" "NumOfGroups = 3\n" --- ./src/onevent.cpp Thu Sep 12 01:37:00 2002 +++ ../licq-1.2.6/./src/onevent.cpp Tue Mar 25 13:13:17 2003 @@ -2,6 +2,7 @@ #include "config.h" #endif +#include #include #include "licq_onevent.h" @@ -99,7 +100,7 @@ if (!strlen(szFullParam)) break; - char szCmd[strlen(m_szCommand) + strlen(szFullParam) + 8]; + char *szCmd = (char *)alloca(strlen(m_szCommand) + strlen(szFullParam) + 8); sprintf(szCmd, "%s %s &", m_szCommand, szFullParam); system(szCmd); break; --- ./src/icqpacket.cpp Sun Mar 2 18:11:16 2003 +++ ../licq-1.2.6/./src/icqpacket.cpp Tue Mar 25 13:31:30 2003 @@ -4,6 +4,7 @@ #include "config.h" #endif +#include #include #include #include @@ -895,7 +896,7 @@ { char len[2]; len[1] = '\0'; - char contacts[uins.size()*13+1]; + char *contacts = (char *)alloca(uins.size()*13+1); contacts[0] = '\0'; for (UinList::iterator iter = uins.begin(); iter != uins.end(); iter++) { --- ./src/user.cpp Thu Mar 6 17:29:19 2003 +++ ../licq-1.2.6/./src/user.cpp Tue Mar 25 14:40:04 2003 @@ -2544,7 +2544,9 @@ m_fConf.ReadBool("HideIP", m_bHideIp, false); m_fConf.ReadNum("RCG", m_nRandomChatGroup, ICQ_RANDOMxCHATxGROUP_NONE); m_fConf.ReadStr("AutoResponse", szTemp, ""); - m_fConf.ReadNum("SSTime", (unsigned long)m_nSSTime, 0L); + unsigned long tmp_m_nSSTime = m_nSSTime; + m_fConf.ReadNum("SSTime", tmp_m_nSSTime, 0L); + m_nSSTime = tmp_m_nSSTime; m_fConf.ReadNum("SSCount", m_nSSCount, 0); SetAutoResponse(szTemp); --- ./src/sar.cpp Tue Oct 15 14:05:40 2002 +++ ../licq-1.2.6/./src/sar.cpp Tue Mar 25 13:07:46 2003 @@ -8,6 +8,8 @@ #include "sar.conf.h" #include "licq_constants.h" +#include "support.h" + class CSARManager gSARManager; --- ./src/Makefile.am Tue Jul 16 23:34:29 2002 +++ ../licq-1.2.6/./src/Makefile.am Tue Mar 25 13:07:46 2003 @@ -1,7 +1,8 @@ #EXTRA_DIST = inc #INCLUDES = -Wall -I$(srcdir)/inc -DINSTALL_PREFIX=\"@prefix@\" @SOCKS_INCDIR@ -INCLUDES = -Wall -I$(top_srcdir)/include -DINSTALL_PREFIX=\"@prefix@\" @SOCKS_INCDIR@ +#INCLUDES = -Wall -I$(top_srcdir)/include -DINSTALL_PREFIX=\"@prefix@\" @SOCKS_INCDIR@ +INCLUDES = -I$(top_srcdir)/include -DINSTALL_PREFIX=\"@prefix@\" @SOCKS_INCDIR@ noinst_HEADERS = licq.conf.h licq.h \ time-fix.h sar.conf.h support.h --- ./src/Makefile.in Sun Mar 23 17:21:30 2003 +++ ../licq-1.2.6/./src/Makefile.in Tue Mar 25 13:14:10 2003 @@ -138,8 +138,8 @@ target_os = @target_os@ target_vendor = @target_vendor@ -#INCLUDES = -Wall -I$(srcdir)/inc -DINSTALL_PREFIX=\"@prefix@\" @SOCKS_INCDIR@ -INCLUDES = -Wall -I$(top_srcdir)/include -DINSTALL_PREFIX=\"@prefix@\" @SOCKS_INCDIR@ +#INCLUDES = -I$(srcdir)/inc -DINSTALL_PREFIX=\"@prefix@\" @SOCKS_INCDIR@ +INCLUDES = -I$(top_srcdir)/include -DINSTALL_PREFIX=\"@prefix@\" @SOCKS_INCDIR@ noinst_HEADERS = licq.conf.h licq.h \ time-fix.h sar.conf.h support.h --- ./src/icqd.cpp Fri Mar 14 20:52:14 2003 +++ ../licq-1.2.6/./src/icqd.cpp Tue Mar 25 13:54:47 2003 @@ -3,6 +3,7 @@ #include "config.h" #endif +#include #include #include #include @@ -791,7 +792,9 @@ static const char file[] = "users.conf"; size_t nLen = strlen(BASE_DIR) + sizeof(file) + sizeof(suffix) + 2; - char szTmpName[nLen], szFilename[nLen], buff[128]; + char *szTmpName = (char *) alloca(nLen); + char *szFilename = (char *) alloca(nLen); + char buff[128]; int nRet, n, fd; snprintf(szFilename, nLen, "%s/%s", BASE_DIR, file); @@ -1898,7 +1901,7 @@ if (!bIsAck) { packet >> nFilenameLen; - char szFilename[nFilenameLen+1]; + char *szFilename = (char *) alloca(nFilenameLen+1); for (unsigned short i = 0; i < nFilenameLen; i++) packet >> szFilename[i]; szFilename[nFilenameLen] = '\0'; // be safe @@ -1978,7 +1981,7 @@ packet >> nLen; packet.incDataPosRead(18); packet >> nLongLen; // plugin len - char szPlugin[nLongLen+1]; + char *szPlugin = (char *) alloca(nLongLen+1); for (unsigned long i = 0; i < nLongLen; i++) packet >> szPlugin[i]; szPlugin[nLongLen] = '\0'; @@ -2003,7 +2006,7 @@ } packet >> nLongLen; - char szMessage[nLongLen+1]; + char *szMessage = (char *) alloca(nLongLen+1); for (unsigned long i = 0; i < nLongLen; i++) packet >> szMessage[i]; szMessage[nLongLen] = '\0'; --- ./src/file.cpp Tue Oct 15 14:05:39 2002 +++ ../licq-1.2.6/./src/file.cpp Tue Mar 25 13:07:46 2003 @@ -20,6 +20,8 @@ #include "licq_file.h" #include "licq_log.h" +#include "support.h" + //=====Pre class helper functions============================================== /*-----Trim-------------------------------------------------------------------- --- ./src/history.cpp Sun Mar 9 11:32:59 2003 +++ ../licq-1.2.6/./src/history.cpp Tue Mar 25 13:07:46 2003 @@ -21,6 +21,8 @@ #include "licq_message.h" #include "licq_icq.h" +#include "support.h" + #define MAX_HISTORY_MSG_SIZE 8192 CUserHistory::CUserHistory() --- ./src/icqd-chat.cpp Fri Jan 17 20:29:31 2003 +++ ../licq-1.2.6/./src/icqd-chat.cpp Tue Mar 25 13:10:54 2003 @@ -3,6 +3,7 @@ #endif #include +#include #include "licq_chat.h" #include "licq_log.h" @@ -1078,7 +1079,7 @@ unsigned short sizeFontName, i; sizeFontName = u->chatQueue[1] | (u->chatQueue[2] << 8); if (u->chatQueue.size() < (unsigned long)(sizeFontName + 2 + 3)) return true; - char nameFont[sizeFontName + 1]; + char *nameFont = (char *) alloca(sizeFontName + 1); for (i = 0; i < sizeFontName; i++) nameFont[i] = u->chatQueue[i + 3]; nameFont[sizeFontName] = '\0'; @@ -1391,7 +1392,7 @@ { unsigned short sizeFontName, i; sizeFontName = u->chatQueue[0] | (u->chatQueue[1] << 8); - char nameFont[sizeFontName + 1]; + char *nameFont = (char *) alloca(sizeFontName + 1); for (i = 0; i < sizeFontName; i++) nameFont[i] = u->chatQueue[i + 2]; nameFont[sizeFontName] = '\0'; --- ./src/icqd-srv.cpp Sun Mar 23 13:09:21 2003 +++ ../licq-1.2.6/./src/icqd-srv.cpp Tue Mar 25 14:21:37 2003 @@ -3,6 +3,7 @@ #include "config.h" #endif +#include #include #include #include @@ -2570,7 +2571,7 @@ packet.incDataPosRead(nLen-2); packet >> nMsgType >> nAckFlags >> nMsgFlags >> nLen; - char szMessage[nLen+1]; + char *szMessage = (char *) alloca(nLen+1); for (unsigned short i = 0; i < nLen; i++) packet >> szMessage[i]; szMessage[nLen] = '\0'; --- ./src/support.c Fri Jan 17 20:29:32 2003 +++ ../licq-1.2.6/./src/support.c Tue Mar 25 13:07:46 2003 @@ -156,7 +156,7 @@ #ifndef HAVE_READDIR_R -#warning Using thread-unsafe readdir function. + /* #warning Using thread-unsafe readdir function. */ while ( (entry = readdir(dirp)) != NULL) { #else @@ -239,8 +239,8 @@ return herror; // Default to thread unsafe version #else -#warning "I don't know how to do reentrant gethostbyname on this machine." -#warning "Using thread-unsafe version." + /* #warning "I don't know how to do reentrant gethostbyname on this machine." */ + /* #warning "Using thread-unsafe version." */ struct hostent *h_buf; h_buf = gethostbyname(szHostName); if (h_buf != NULL) memcpy(h, h_buf, sizeof(struct hostent)); --- ./src/socket.cpp Thu Mar 6 17:20:29 2003 +++ ../licq-1.2.6/./src/socket.cpp Tue Mar 25 13:07:46 2003 @@ -1012,7 +1012,7 @@ 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 @@ { 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); --- ./src/icqd-tcp.cpp Wed Mar 12 12:38:06 2003 +++ ../licq-1.2.6/./src/icqd-tcp.cpp Tue Mar 25 14:11:31 2003 @@ -8,6 +8,7 @@ #include #include #include +#include #include "time-fix.h" @@ -133,7 +134,7 @@ szDescDos = gTranslator.NToRN(description); gTranslator.ClientToServer(szDescDos); int n = strlen_safe(url) + strlen_safe(szDescDos) + 2; - char m[n]; + char *m = (char*) alloca(n); if (!online && n > MAX_MESSAGE_SIZE && szDescDos != NULL) szDescDos[MAX_MESSAGE_SIZE - strlen_safe(url) - 2] = '\0'; sprintf(m, "%s%c%s", szDescDos == NULL ? "" : szDescDos, char(0xFE), url == NULL ? "" : url); @@ -1198,7 +1199,7 @@ return false; // read in the message minus any stupid DOS \r's - char message[messageLen + 1]; + char *message = (char*) alloca(messageLen + 1); unsigned short j = 0; for (unsigned short i = 0; i < messageLen; i++) { @@ -1561,7 +1562,7 @@ unsigned long nFileLength; packet >> junkLong >> nLenFilename; - char szFilename[nLenFilename+1]; + char *szFilename = (char *) alloca(nLenFilename+1); for (unsigned short i = 0; i < nLenFilename; i++) packet >> szFilename[i]; szFilename[nLenFilename] = '\0'; @@ -1613,7 +1614,7 @@ packet.incDataPosRead(18); packet >> nLongLen; // plugin name len - char szPlugin[nLongLen+1]; + char *szPlugin = (char *)alloca(nLongLen+1); for (unsigned long i = 0; i < nLongLen; i++) packet >> szPlugin[i]; szPlugin[nLongLen] = '\0'; @@ -1637,7 +1638,7 @@ break; } - char szMessage[nLongLen+1]; + char *szMessage = (char*) alloca(nLongLen+1); for (unsigned long i = 0; i < nLongLen; i++) packet >> szMessage[i]; szMessage[nLongLen] = '\0'; @@ -1650,7 +1651,7 @@ packet.incDataPosRead(2); // port (BE) packet.incDataPosRead(2); // unknown packet >> nLen; // filename len, including NULL - char szFilename[nLen+1]; + char *szFilename = (char *) alloca(nLen+1); for (unsigned short i = 0; i < nLen; i++) packet >> szFilename[i]; szFilename[nLen] = '\0'; @@ -1976,7 +1977,7 @@ packet.incDataPosRead(18); // eh? packet >> nLongLen; // Plugin name len - char szPlugin[nLongLen+1]; + char *szPlugin = (char *) alloca(nLongLen+1); for (unsigned long i = 0; i < nLongLen; i++) packet >> szPlugin[i]; szPlugin[nLongLen] = '\0'; @@ -2002,7 +2003,7 @@ } packet >> nLongLen; - char szMessage[nLongLen+1]; + char *szMessage = (char *) alloca(nLongLen+1); for (unsigned short i = 0; i < nLongLen; i++) packet >> szMessage[i]; szMessage[nLongLen] = '\0'; --- ./src/icqd-udp.cpp Mon Jul 15 00:46:12 2002 +++ ../licq-1.2.6/./src/icqd-udp.cpp Tue Mar 25 13:07:46 2003 @@ -8,6 +8,7 @@ #include #include #include +#include #include "time-fix.h" @@ -1641,7 +1642,7 @@ packet >> nLen; // read in the user data from the packet - char szMessage[nLen + 1]; + char *szMessage = (char*) alloca(nLen + 1); for (i = 0, j = 0; i < nLen; i++) { packet >> c; --- ./plugins/rms/src/Makefile.in Sun Mar 23 17:23:48 2003 +++ ../licq-1.2.6/./plugins/rms/src/Makefile.in Tue Mar 25 14:47:25 2003 @@ -138,7 +138,7 @@ plugindir = $(libdir) licq_incdir = @LICQ_INCLUDES@ -INCLUDES = -Wall -I$(srcdir) -I$(licq_incdir) +INCLUDES = -I$(srcdir) -I$(licq_incdir) noinst_HEADERS = rms.h --- ./plugins/qt-gui/po/Makefile.in Sun Mar 23 17:21:47 2003 +++ ../licq-1.2.6/./plugins/qt-gui/po/Makefile.in Thu Mar 27 09:59:22 2003 @@ -322,7 +322,9 @@ all-local: - @if test -x /usr/bin/test; then \ + @if [ -n "$(NTTEST)" ]; then \ + nt_test="$(NTTEST)"; \ + elif test -x /usr/bin/test; then \ nt_test="/usr/bin/test"; \ else \ nt_test=`which test`; \ --- ./plugins/qt-gui/src/mainwin.cpp Tue Mar 18 12:03:50 2003 +++ ../licq-1.2.6/./plugins/qt-gui/src/mainwin.cpp Tue Mar 25 13:26:07 2003 @@ -1109,7 +1109,7 @@ // --------------------------------------------------------------------------- -inline bool CMainWindow::show_user(ICQUser *u) +bool CMainWindow::show_user(ICQUser *u) { return (m_bShowOffline || !u->StatusOffline() || u->NewMessages() > 0 || (m_bAlwaysShowONU && u->OnlineNotify())); --- ./plugins/qt-gui/src/awaymsgdlg.cpp Tue Jan 21 11:54:57 2003 +++ ../licq-1.2.6/./plugins/qt-gui/src/awaymsgdlg.cpp Tue Mar 25 13:27:21 2003 @@ -35,7 +35,7 @@ #include "licq_user.h" #include "licq_icqd.h" -static const char hints[] = QT_TRANSLATE_NOOP("AwayMsgDlg", +static const char *hints = QT_TRANSLATE_NOOP("AwayMsgDlg", "

Hints for Setting
your Auto-Response



" "
    " "
  • You can include any of the % expansions (described in the main hints page).
    • " --- ./plugins/qt-gui/configure Sun Mar 23 17:21:49 2003 +++ ../licq-1.2.6/./plugins/qt-gui/configure Tue Mar 25 13:27:58 2003 @@ -16753,7 +16753,7 @@ fi else - CXXFLAGS="$CXXFLAGS -Wall" + CXXFLAGS="$CXXFLAGS" fi --- ./plugins/email/src/Makefile.in Sun Mar 23 17:24:25 2003 +++ ../licq-1.2.6/./plugins/email/src/Makefile.in Tue Mar 25 14:47:40 2003 @@ -138,7 +138,7 @@ plugindir = $(libdir) licq_incdir = @LICQ_INCLUDES@ -INCLUDES = -Wall -I$(srcdir) -I$(licq_incdir) +INCLUDES = -I$(srcdir) -I$(licq_incdir) noinst_HEADERS = forwarder.h --- ./plugins/auto-reply/src/Makefile.in Sun Mar 23 17:24:42 2003 +++ ../licq-1.2.6/./plugins/auto-reply/src/Makefile.in Tue Mar 25 14:46:46 2003 @@ -136,7 +136,7 @@ plugindir = $(libdir) licq_incdir = @LICQ_INCLUDES@ -INCLUDES = -Wall -fno-rtti -fno-exceptions -I$(srcdir) -I$(licq_incdir) +INCLUDES = -I$(srcdir) -I$(licq_incdir) noinst_HEADERS = autoreply.h --- ./plugins/console/src/Makefile.in Sun Mar 23 17:22:01 2003 +++ ../licq-1.2.6/./plugins/console/src/Makefile.in Tue Mar 25 13:28:39 2003 @@ -138,7 +138,7 @@ plugindir = $(libdir) licq_incdir = @LICQ_INCLUDES@ -INCLUDES = -Wall -I$(srcdir) -I$(licq_incdir) -I/usr/include/ncurses +INCLUDES = -I$(srcdir) -I$(licq_incdir) -I/usr/include/ncurses noinst_HEADERS = console.h event_data.h window.h --- ./plugins/console/src/console.h Tue Feb 11 02:00:13 2003 +++ ../licq-1.2.6/./plugins/console/src/console.h Tue Mar 25 13:29:43 2003 @@ -10,6 +10,9 @@ #include "window.h" #include "licq_user.h" +#include +#include + using namespace std; #define MAX_CON 8 --- ./plugins/console/src/console.cpp Sun Feb 16 16:40:56 2003 +++ ../licq-1.2.6/./plugins/console/src/console.cpp Tue Mar 25 15:53:50 2003 @@ -3,8 +3,6 @@ #endif #include -#include -#include #include #include #include --- ./configure Sun Mar 23 17:21:31 2003 +++ ../licq-1.2.6/./configure Tue Mar 25 13:14:43 2003 @@ -6116,9 +6116,9 @@ fi if test $ac_cv_header_socks_h = yes; then if test "$socks_incdir" == "no"; then - SOCKS_INCDIR="-Wno-implicit" + SOCKS_INCDIR="" else - SOCKS_INCDIR="-I$socks_incdir -Wno-implicit" + SOCKS_INCDIR="-I$socks_incdir" fi WITH_SOCKS5="yes"