diff options
Diffstat (limited to 'qtools')
-rw-r--r-- | qtools/qglobal.h | 5 | ||||
-rw-r--r-- | qtools/qregexp.cpp | 2 | ||||
-rw-r--r-- | qtools/qwaitcondition_unix.cpp | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/qtools/qglobal.h b/qtools/qglobal.h index 18d56ab..9a97015 100644 --- a/qtools/qglobal.h +++ b/qtools/qglobal.h @@ -92,7 +92,10 @@ # if !defined(MAC_OS_X_VERSION_10_7) # define MAC_OS_X_VERSION_10_7 MAC_OS_X_VERSION_10_6 + 10 # endif -# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_7) +# if !defined(MAC_OS_X_VERSION_10_8) +# define MAC_OS_X_VERSION_10_8 MAC_OS_X_VERSION_10_7 + 10 +# endif +# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_8) # warning "This version of Mac OS X is unsupported" # endif #elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__) diff --git a/qtools/qregexp.cpp b/qtools/qregexp.cpp index b151558..2b3770c 100644 --- a/qtools/qregexp.cpp +++ b/qtools/qregexp.cpp @@ -826,7 +826,7 @@ static uint char_val( const char **str, uint *strlength ) // get char value } -#if defined(DEBUG) +#if 0 //defined(DEBUG) static uint *dump( uint *p ) { while ( *p != END ) { diff --git a/qtools/qwaitcondition_unix.cpp b/qtools/qwaitcondition_unix.cpp index aa22a4b..d1ff27e 100644 --- a/qtools/qwaitcondition_unix.cpp +++ b/qtools/qwaitcondition_unix.cpp @@ -51,8 +51,9 @@ static void report_error(int code, const char *where, const char *what) qWarning("%s: %s failure: %d", where, what, code); } -struct QWaitConditionPrivate +class QWaitConditionPrivate { + public: pthread_mutex_t mutex; pthread_cond_t cond; int waiters; |