diff options
| author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2011-09-03 14:20:46 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-09-06 13:30:26 (GMT) |
| commit | a5211c5c259f2741bf1f3f9dabf6587516eee052 (patch) | |
| tree | ddf9a88ed82130eb19b9cd136ca3b6b277002b5e /src/corelib | |
| parent | 02f55668dada4a23ab84e4d3bda1df8a4984b3ae (diff) | |
| download | Qt-a5211c5c259f2741bf1f3f9dabf6587516eee052.zip Qt-a5211c5c259f2741bf1f3f9dabf6587516eee052.tar.gz Qt-a5211c5c259f2741bf1f3f9dabf6587516eee052.tar.bz2 | |
Fix the build with -qtnamespace configure options
Merge-Request: 1291
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/arch/generic/qatomic_generic_windows.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/kernel/qsystemsemaphore_win.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/arch/generic/qatomic_generic_windows.cpp b/src/corelib/arch/generic/qatomic_generic_windows.cpp index 7ce0eea..123b823 100644 --- a/src/corelib/arch/generic/qatomic_generic_windows.cpp +++ b/src/corelib/arch/generic/qatomic_generic_windows.cpp @@ -43,6 +43,7 @@ #include <QtCore/qatomic.h> +QT_BEGIN_NAMESPACE class QCriticalSection { @@ -129,3 +130,5 @@ void *QBasicAtomicPointer_fetchAndAddOrdered(void * volatile *_q_value, qptrdiff qAtomicCriticalSection.unlock(); return returnValue; } + +QT_END_NAMESPACE diff --git a/src/corelib/kernel/qsystemsemaphore_win.cpp b/src/corelib/kernel/qsystemsemaphore_win.cpp index 0e9d645..76b57b9 100644 --- a/src/corelib/kernel/qsystemsemaphore_win.cpp +++ b/src/corelib/kernel/qsystemsemaphore_win.cpp @@ -133,6 +133,6 @@ bool QSystemSemaphorePrivate::modifySemaphore(int count) return true; } -#endif // QT_NO_SYSTEMSEMAPHORE - QT_END_NAMESPACE + +#endif // QT_NO_SYSTEMSEMAPHORE |