TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 8 insertions, 8 deletions

diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h
index 623b9d10..b4a0b904 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h
@@ -45,7 +45,7 @@ typedef fd_set ortp_fd_set;
   do {									      \
     unsigned int __i;							      \
     ortp_fd_set *__arr = (s);						      \
-    for (__i = 0; __i < sizeof (ortp_fd_set) / sizeof (ortp__fd_mask); ++__i)	      \
+    for (__i = 0; __i < sizeof (ortp_fd_set) / sizeof (ortp__fd_tqmask); ++__i)	      \
       ORTP__FDS_BITS (__arr)[__i] = 0;					      \
   } while (0)
 #define ORTP_FD_SET(d, s)     (ORTP__FDS_BITS (s)[ORTP__FDELT(d)] |= ORTP__FDMASK(d))
@@ -55,22 +55,22 @@ typedef fd_set ortp_fd_set;
 
 
 /* The fd_set member is required to be an array of longs.  */
-typedef long int ortp__fd_mask;
+typedef long int ortp__fd_tqmask;
 
 
 /* Number of bits per word of `fd_set' (some code assumes this is 32).  */
 #define ORTP__FD_SETSIZE 1024
 
 /* It's easier to assume 8-bit bytes than to get CHAR_BIT.  */
-#define ORTP__NFDBITS	(8 * sizeof (ortp__fd_mask))
+#define ORTP__NFDBITS	(8 * sizeof (ortp__fd_tqmask))
 #define	ORTP__FDELT(d)	((d) / ORTP__NFDBITS)
-#define	ORTP__FDMASK(d)	((ortp__fd_mask) 1 << ((d) % ORTP__NFDBITS))
+#define	ORTP__FDMASK(d)	((ortp__fd_tqmask) 1 << ((d) % ORTP__NFDBITS))
 
 
 /* fd_set for select and pselect.  */
 typedef struct
   {
-    ortp__fd_mask fds_bits[ORTP__FD_SETSIZE / ORTP__NFDBITS];
+    ortp__fd_tqmask fds_bits[ORTP__FD_SETSIZE / ORTP__NFDBITS];
 # define ORTP__FDS_BITS(set) ((set)->fds_bits)
   } ortp_fd_set;
 
@@ -87,9 +87,9 @@ typedef struct _SessionSet SessionSet;
 
 SessionSet * session_set_new();
 #define session_set_init(ss)		ORTP_FD_ZERO(&(ss)->rtpset)
-#define session_set_set(ss,rtpsession)		ORTP_FD_SET((rtpsession)->mask_pos,&(ss)->rtpset)
-#define session_set_is_set(ss,rtpsession)	ORTP_FD_ISSET((rtpsession)->mask_pos,&(ss)->rtpset)
-#define session_set_clr(ss,rtpsession)		ORTP_FD_CLR((rtpsession)->mask_pos,&(ss)->rtpset)
+#define session_set_set(ss,rtpsession)		ORTP_FD_SET((rtpsession)->tqmask_pos,&(ss)->rtpset)
+#define session_set_is_set(ss,rtpsession)	ORTP_FD_ISSET((rtpsession)->tqmask_pos,&(ss)->rtpset)
+#define session_set_clr(ss,rtpsession)		ORTP_FD_CLR((rtpsession)->tqmask_pos,&(ss)->rtpset)
 
 #define session_set_copy(dest,src)		memcpy(&(dest)->rtpset,&(src)->rtpset,sizeof(ortp_fd_set))