diff options
| author | Sinan Tanilkan <sinan.tanilkan@nokia.com> | 2011-09-21 11:45:02 (GMT) |
|---|---|---|
| committer | Sinan Tanilkan <sinan.tanilkan@nokia.com> | 2011-09-21 11:45:02 (GMT) |
| commit | 160b82950ec53d3a0392df0fd18ac6856bfecbcf (patch) | |
| tree | 1bdae6efe3fbcb7f25e0ce91884f83e1cdf68189 /src/qt3support/network | |
| parent | 8ba781b01e900148fec2e9d26485369b3295487f (diff) | |
| parent | 085bd7cf2d76f9acd548120f859201b014970a72 (diff) | |
| download | Qt-160b82950ec53d3a0392df0fd18ac6856bfecbcf.zip Qt-160b82950ec53d3a0392df0fd18ac6856bfecbcf.tar.gz Qt-160b82950ec53d3a0392df0fd18ac6856bfecbcf.tar.bz2 | |
Merge branch '4.8' into earth-staging-master
Conflicts:
dist/changes-4.8.0
Diffstat (limited to 'src/qt3support/network')
| -rw-r--r-- | src/qt3support/network/q3socketdevice_win.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qt3support/network/q3socketdevice_win.cpp b/src/qt3support/network/q3socketdevice_win.cpp index df115d7..bde63a0 100644 --- a/src/qt3support/network/q3socketdevice_win.cpp +++ b/src/qt3support/network/q3socketdevice_win.cpp @@ -83,8 +83,13 @@ typedef struct { struct qt_in6_addr sin6_addr; /* IPv6 address */ u_long sin6_scope_id; /* set of interfaces for a scope */ } qt_sockaddr_in6; + +QT_END_NAMESPACE + #endif +QT_BEGIN_NAMESPACE + #ifndef AF_INET6 #define AF_INET6 23 /* Internetwork Version 6 */ #endif |