aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOleg Gerasimov <ogerasimov@gmail.com>2016-08-13 21:40:51 +0300
committerOleg Gerasimov <ogerasimov@gmail.com>2016-08-20 17:52:30 +0300
commit026379bafda46c83957ab7f58b4144ed84129d31 (patch)
tree1a24423608ad001860291d5fe027942d724f4561 /src
parent09c5c313030b5f8f4e882b15f60371ff70bc2ce4 (diff)
downloaduGFX-026379bafda46c83957ab7f58b4144ed84129d31.tar.gz
uGFX-026379bafda46c83957ab7f58b4144ed84129d31.tar.bz2
uGFX-026379bafda46c83957ab7f58b4144ed84129d31.zip
Fix function SendKeyboardEvent name conflict in single file build
Diffstat (limited to 'src')
-rw-r--r--src/gwin/gwin_keyboard.c12
1 files changed, 6 insertions, 6 deletions
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);