diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-10-20 16:07:49 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-10-20 16:07:49 +0000 |
| commit | 12bfabec70065f7994f91a9b315e2b69892b0a57 (patch) | |
| tree | 7b344f74705f7a44e4fddc333d13767ad89792de /NxWidgets/libnxwidgets | |
| parent | 69a2786e6d69fc3b478a1f1458312e4bb20260d1 (diff) | |
| download | px4-nuttx-12bfabec70065f7994f91a9b315e2b69892b0a57.tar.gz px4-nuttx-12bfabec70065f7994f91a9b315e2b69892b0a57.tar.bz2 px4-nuttx-12bfabec70065f7994f91a9b315e2b69892b0a57.zip | |
Several bugfixes contributed by Petteri Aimonen
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5238 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/libnxwidgets')
| -rw-r--r-- | NxWidgets/libnxwidgets/Makefile | 4 | ||||
| -rw-r--r-- | NxWidgets/libnxwidgets/src/ccallback.cxx | 3 | ||||
| -rw-r--r-- | NxWidgets/libnxwidgets/src/cnxserver.cxx | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/NxWidgets/libnxwidgets/Makefile b/NxWidgets/libnxwidgets/Makefile index 0afb55e69..92eb87751 100644 --- a/NxWidgets/libnxwidgets/Makefile +++ b/NxWidgets/libnxwidgets/Makefile @@ -92,7 +92,7 @@ CXXFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(NXWIDGETDIR DEPPATH = --dep-path src VPATH = src -all: $(BIN) +all: check_nuttx $(BIN) .PHONY = check_nuttx depend clean distclean export $(AOBJS): %$(OBJEXT): %.S @@ -122,7 +122,7 @@ check_nuttx: fi; \ ) -$(BIN): check_nuttx $(OBJS) +$(BIN): $(OBJS) @( for obj in $(OBJS) ; do \ $(call ARCHIVE, $@, $${obj}); \ done ; ) diff --git a/NxWidgets/libnxwidgets/src/ccallback.cxx b/NxWidgets/libnxwidgets/src/ccallback.cxx index 374502a38..269a5cdb1 100644 --- a/NxWidgets/libnxwidgets/src/ccallback.cxx +++ b/NxWidgets/libnxwidgets/src/ccallback.cxx @@ -226,6 +226,8 @@ void CCallback::newKeyboardEvent(NXHANDLE hwnd, uint8_t nCh, } } +#endif // CONFIG_NX_KBD + /** * This callback is the response from nx_block (or nxtk_block). Those * blocking interfaces are used to assure that no further messages are @@ -260,4 +262,3 @@ void CCallback::windowBlocked(NXWINDOW hwnd, FAR void *arg1, FAR void *arg2) } #endif -#endif // CONFIG_NX_KBD diff --git a/NxWidgets/libnxwidgets/src/cnxserver.cxx b/NxWidgets/libnxwidgets/src/cnxserver.cxx index 8816c73bc..4d5a6e681 100644 --- a/NxWidgets/libnxwidgets/src/cnxserver.cxx +++ b/NxWidgets/libnxwidgets/src/cnxserver.cxx @@ -225,7 +225,7 @@ bool CNxServer::connect(void) // Wait a bit to let the server get started - sleep(1); + usleep(50*1000); // Connect to the server |