diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-10 09:54:53 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-10 10:52:58 (GMT) |
| commit | 9d073c3c92f732ec73587b0696e8994107a98402 (patch) | |
| tree | 0968f3aa7a5b85e5e94288a943db0f92a8db79e8 | |
| parent | fdf5fd0cc63c20579250087905331eb76385d528 (diff) | |
| download | Qt-9d073c3c92f732ec73587b0696e8994107a98402.zip Qt-9d073c3c92f732ec73587b0696e8994107a98402.tar.gz Qt-9d073c3c92f732ec73587b0696e8994107a98402.tar.bz2 | |
Fix compilation support with namespaces for QtLibcSupplement
Reviewed-By: hjk <qtc-committer@nokia.com>
| -rw-r--r-- | src/corelib/kernel/qcore_unix_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h index 1bf2425..8d43897 100644 --- a/src/corelib/kernel/qcore_unix_p.h +++ b/src/corelib/kernel/qcore_unix_p.h @@ -69,19 +69,19 @@ struct sockaddr; -QT_BEGIN_NAMESPACE - #if defined(Q_OS_LINUX) && defined(O_CLOEXEC) && defined(__GLIBC__) && (__GLIBC__ * 0x100 + __GLIBC_MINOR__) >= 0x0204 // Linux supports thread-safe FD_CLOEXEC # define QT_UNIX_SUPPORTS_THREADSAFE_CLOEXEC 1 +QT_BEGIN_NAMESPACE namespace QtLibcSupplement { Q_CORE_EXPORT int accept4(int, sockaddr *, QT_SOCKLEN_T *, int flags); Q_CORE_EXPORT int dup3(int oldfd, int newfd, int flags); Q_CORE_EXPORT int pipe2(int pipes[], int flags); } +QT_END_NAMESPACE +using namespace QT_PREPEND_NAMESPACE(QtLibcSupplement); -using namespace QtLibcSupplement; #else # define QT_UNIX_SUPPORTS_THREADSAFE_CLOEXEC 0 #endif @@ -91,6 +91,7 @@ using namespace QtLibcSupplement; var = cmd; \ } while (var == -1 && errno == EINTR) +QT_BEGIN_NAMESPACE // don't call QT_OPEN or ::open // call qt_safe_open |