summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2014-02-16 12:26:34 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2014-02-16 12:26:34 -0600
commite1cfdba7757612b1993b598093aa13f2d1d3d345 (patch)
treeade2baab4bc8b4aafef44084ebfeb82a3c769aa1
parent246aeb85edaed7bdb44a675c9524719a0341a7be (diff)
downloadtdenetwork-e1cfdba7757612b1993b598093aa13f2d1d3d345.tar.gz
tdenetwork-e1cfdba7757612b1993b598093aa13f2d1d3d345.zip
Fix unintended renaming
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtp.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c2
-rw-r--r--krdc/vnc/threads.cpp4
-rw-r--r--krfb/srvloc/getifaddrs.cpp6
4 files changed, 7 insertions, 7 deletions
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtp.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtp.h
index f67409d8..625d2111 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtp.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtp.h
@@ -26,7 +26,7 @@
-#define RTP_MAX_RTQ_SIZE 100 /* max number of packet allowed to be enqueued */
+#define RTP_MAX_RQ_SIZE 100 /* max number of packet allowed to be enqueued */
#define IPMAXLEN 20
#define UDP_MAX_SIZE 65536
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c
index a73aa121..de6b2e7d 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c
@@ -104,7 +104,7 @@ rtp_session_init (RtpSession * session, gint mode)
{
memset (session, 0, sizeof (RtpSession));
session->lock = g_mutex_new ();
- session->rtp.max_rq_size = RTP_MAX_RTQ_SIZE;
+ session->rtp.max_rq_size = RTP_MAX_RQ_SIZE;
session->mode = mode;
if ((mode == RTP_SESSION_RECVONLY) || (mode == RTP_SESSION_SENDRECV))
{
diff --git a/krdc/vnc/threads.cpp b/krdc/vnc/threads.cpp
index 05d55df9..cf32d081 100644
--- a/krdc/vnc/threads.cpp
+++ b/krdc/vnc/threads.cpp
@@ -31,7 +31,7 @@
static const int MAXIMUM_WAIT_PERIOD = 8000;
// time to postpone incremental updates that have not been requested explicitly
-static const int POSTPONED_INCRRTQ_WAIT_PERIOD = 110;
+static const int POSTPONED_INCRRQ_WAIT_PERIOD = 110;
static const int MOUSEPRESS_QUEUE_SIZE = 5;
static const int MOUSEMOVE_QUEUE_SIZE = 3;
@@ -317,7 +317,7 @@ void WriterThread::run() {
(clientCut.isNull())) {
if (!m_waiter.wait(&m_lock,
m_lastIncrUpdatePostponed ?
- POSTPONED_INCRRTQ_WAIT_PERIOD : MAXIMUM_WAIT_PERIOD))
+ POSTPONED_INCRRQ_WAIT_PERIOD : MAXIMUM_WAIT_PERIOD))
m_incrementalUpdateRQ = true;
m_lock.unlock();
}
diff --git a/krfb/srvloc/getifaddrs.cpp b/krfb/srvloc/getifaddrs.cpp
index 339c599c..296ca19e 100644
--- a/krfb/srvloc/getifaddrs.cpp
+++ b/krfb/srvloc/getifaddrs.cpp
@@ -53,7 +53,7 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd)
struct ifconf ifc;
int rq_len;
int nifs;
-# define RTQ_IFS 4
+# define RQ_IFS 4
if (fd < 0)
fd = socket (AF_INET, SOCK_DGRAM, 0);
@@ -74,13 +74,13 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd)
ifc.ifc_len = 0;
if (ioctl (fd, SIOCGIFCONF, &ifc) < 0 || ifc.ifc_len == 0)
{
- rq_len = RTQ_IFS * sizeof (struct ifreq);
+ rq_len = RQ_IFS * sizeof (struct ifreq);
}
else
rq_len = ifc.ifc_len;
}
else
- rq_len = RTQ_IFS * sizeof (struct ifreq);
+ rq_len = RQ_IFS * sizeof (struct ifreq);
/* Read all the interfaces out of the kernel. */
while (1)