← Back to branch summary

~ubuntu-branches/ubuntu/vivid/libktorrent/vivid

« back to all changes in this revision

Viewing changes to src/net/socket.cpp

  • Committer: Package Import Robot
  • Author(s): Howard Chan
  • Date: 2013-02-04 22:32:34 UTC
  • mfrom: (5.3.1 experimental)
  • Revision ID: package-import@ubuntu.com-20130204223234-cgfkrck4lt3e3nut
Tags: 1.3.1-1ubuntu1
https://launchpad.net/bugs/1111458
* Merge from debian experimental (LP: #1111458)
  + Update symbols file to fix FTBFS with raring toolchain. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/net/socket.cpp
66
66
                if (m_ip_version != 4 && m_ip_version != 6)
67
67
                        m_ip_version = 4;
68
68
                
69
 
#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020 && !defined(__DragonFly__))
 
69
#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
70
70
                int val = 1; 
71
71
                if (setsockopt(m_fd,SOL_SOCKET,SO_NOSIGPIPE,&val,sizeof(int)) < 0)
72
72
                {
88
88
                        Out(SYS_GEN|LOG_IMPORTANT) << QString("Cannot create socket : %1").arg(strerror(errno)) << endl;
89
89
                m_fd = fd;
90
90
                
91
 
#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020 && !defined(__DragonFly__))
 
91
#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
92
92
                int val = 1;
93
93
                if (setsockopt(m_fd,SOL_SOCKET,SO_NOSIGPIPE,&val,sizeof(int)) < 0)
94
94
                {
118
118
                        Out(SYS_GEN|LOG_IMPORTANT) << QString("Cannot create socket : %1").arg(strerror(errno)) << endl;
119
119
                m_fd = fd;
120
120
                
121
 
#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020 && !defined(__DragonFly__))
 
121
#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
122
122
                int val = 1;
123
123
                if (setsockopt(m_fd,SOL_SOCKET,SO_NOSIGPIPE,&val,sizeof(int)) < 0)
124
124
                {
335
335
 
336
336
                if (m_ip_version == 4)
337
337
                {
338
 
#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020) || defined(Q_OS_NETBSD) || defined(Q_OS_BSD4)
 
338
#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || defined(Q_OS_NETBSD) || defined(Q_OS_BSD4)
339
339
                        unsigned int c = type_of_service;
340
340
#else
341
341
                        unsigned char c = type_of_service;