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 | |
| 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
| -rw-r--r-- | src/gfx_compilers.h | 2 | ||||
| -rw-r--r-- | src/gos/gos_osx.h | 1 | ||||
| -rw-r--r-- | src/gos/gos_qt.cpp | 2 | ||||
| -rw-r--r-- | src/gwin/gwin_keyboard.c | 12 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/gfx_compilers.h b/src/gfx_compilers.h index 31f2ce39..2c58ec5c 100644 --- a/src/gfx_compilers.h +++ b/src/gfx_compilers.h @@ -336,7 +336,7 @@ #define GFX_COMPILER_VERSION_MAJOR (__clang_major__) #define GFX_COMPILER_VERSION_MINOR (__clang_minor__) #define GFX_COMPILER_VERSION_PATCH (__clang_patchlevel__) - #define DEPRECATED(msg) __attribute__((deprecated(msg))); + #define DEPRECATED(msg) __attribute__((deprecated(msg))) #elif GFX_COMPILER == GFX_COMPILER_COMEAU #define GFX_COMPILER_NAME "Comeau C++" #define GFX_COMPILER_VERSION_MAJOR ((__COMO_VERSION__)/100) 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 { diff --git a/src/gwin/gwin_keyboard.c b/src/gwin/gwin_keyboard.c index f3dd6fb0..45021910 100644 --- a/src/gwin/gwin_keyboard.c +++ b/src/gwin/gwin_keyboard.c @@ -114,7 +114,7 @@ static int NumKeyRows(const char **keyset) { return len; } -static void SendKeyboardEventToListener(GSourceListener *psl, GKeyboardObject *gk) { +static void _SendKeyboardEventToListener(GSourceListener *psl, GKeyboardObject *gk) { GEventKeyboard *pe; const GVSpecialKey *skey; unsigned i; @@ -157,18 +157,18 @@ static void SendKeyboardEventToListener(GSourceListener *psl, GKeyboardObject *g geventSendEvent(psl); } -static void SendKeyboardEvent(GKeyboardObject *gk) { +static void _SendKeyboardEvent(GKeyboardObject *gk) { GSourceListener *psl; // Send to the "All Keyboards" source listeners psl = 0; while ((psl = geventGetSourceListener(AllKeyboards, psl))) - SendKeyboardEventToListener(psl, gk); + _SendKeyboardEventToListener(psl, gk); // Send to the keyboard specific source listeners psl = 0; while ((psl = geventGetSourceListener((GSourceHandle)gk, psl))) - SendKeyboardEventToListener(psl, gk); + _SendKeyboardEventToListener(psl, gk); } @@ -257,7 +257,7 @@ static void SendKeyboardEvent(GKeyboardObject *gk) { // Send the key if required if (skey->sendkey && skey->sendkey[0]) - SendKeyboardEvent(gk); + _SendKeyboardEvent(gk); // Update the display _gwinUpdate((GHandle)gw); @@ -274,7 +274,7 @@ static void SendKeyboardEvent(GKeyboardObject *gk) { } // Send the key - SendKeyboardEvent(gk); + _SendKeyboardEvent(gk); // Update the display _gwinUpdate((GHandle)gw); |