uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'compile_fixes_mr' of olegator77/uGFX into master

Browse Source
This commit is contained in:
inmarket 2016-08-21 04:24:10 +02:00 committed by Gogs
commit 2db86d4f67
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gfx_compilers.h
View File

@ -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)

1
src/gos/gos_osx.h
View File

@ -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 */

2
src/gos/gos_qt.cpp
View File

@ -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
{

12
src/gwin/gwin_keyboard.c
View File

@ -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);