diff options
| author | inmarket <inmarket@ugfx.org> | 2016-08-21 04:24:10 +0200 |
|---|---|---|
| committer | Gogs <gogs@fake.local> | 2016-08-21 04:24:10 +0200 |
| commit | 2db86d4f6730e972f649f985d948a51ea08aea41 (patch) | |
| tree | 86c1258b31bfc00691a802d0da0030374b42137d /src/gos | |
| parent | 966313405934f6869e7a2fa37d026a45a89d7667 (diff) | |
| parent | fe84a7b9dda687363ead3d4a13f9161560f3d7a0 (diff) | |
| download | uGFX-2db86d4f6730e972f649f985d948a51ea08aea41.tar.gz uGFX-2db86d4f6730e972f649f985d948a51ea08aea41.tar.bz2 uGFX-2db86d4f6730e972f649f985d948a51ea08aea41.zip | |
Merge branch 'compile_fixes_mr' of olegator77/uGFX into master
Diffstat (limited to 'src/gos')
| -rw-r--r-- | src/gos/gos_osx.h | 1 | ||||
| -rw-r--r-- | src/gos/gos_qt.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gos/gos_osx.h b/src/gos/gos_osx.h index 44853937..9a8e10d9 100644 --- a/src/gos/gos_osx.h +++ b/src/gos/gos_osx.h @@ -13,6 +13,7 @@ #include <sys/types.h> #include <stdint.h> #include <pthread.h> +#include <stdlib.h> /* Already defined int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, size_t */ diff --git a/src/gos/gos_qt.cpp b/src/gos/gos_qt.cpp index 1708a478..e3a0f0ca 100644 --- a/src/gos/gos_qt.cpp +++ b/src/gos/gos_qt.cpp @@ -7,12 +7,12 @@ #include "../../gfx.h" +#if GFX_USE_OS_QT #include <QMutex> #include <QSemaphore> #include <QThread> #include <QElapsedTimer> -#if GFX_USE_OS_QT class Thread : public QThread { |