diff options
| author | mwturvey <michael.w.turvey@intel.com> | 2017-03-24 15:19:59 -0700 |
|---|---|---|
| committer | mwturvey <michael.w.turvey@intel.com> | 2017-03-24 15:19:59 -0700 |
| commit | 4dc1d72785c660c206f8def9d8c8aa32289c2709 (patch) | |
| tree | b6b06ee4504ac4afd76a885343373919e120341b /redist | |
| parent | f7d1c19e299df46087eb8693d2d0c0637d2e395f (diff) | |
| download | libsurvive-4dc1d72785c660c206f8def9d8c8aa32289c2709.tar.gz libsurvive-4dc1d72785c660c206f8def9d8c8aa32289c2709.tar.bz2 | |
More cleanup & finishing genericization of calibrator
Diffstat (limited to 'redist')
| -rw-r--r-- | redist/CNFGWinDriver.c | 2 | ||||
| -rw-r--r-- | redist/json_helpers.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/redist/CNFGWinDriver.c b/redist/CNFGWinDriver.c index c5da925..b1c1eb0 100644 --- a/redist/CNFGWinDriver.c +++ b/redist/CNFGWinDriver.c @@ -232,7 +232,7 @@ void CNFGHandleInput() case WM_MBUTTONUP: HandleButton( (msg.lParam & 0xFFFF), (msg.lParam>>16) & 0xFFFF, 3, 0 ); break; case WM_KEYDOWN: case WM_KEYUP: - HandleKey( tolower( msg.wParam ), (msg.message==WM_KEYDOWN) ); + HandleKey( tolower( (int)(msg.wParam) ), (msg.message==WM_KEYDOWN) ); break; default: DispatchMessage(&msg); diff --git a/redist/json_helpers.c b/redist/json_helpers.c index 3b5cc0d..29d48bd 100644 --- a/redist/json_helpers.c +++ b/redist/json_helpers.c @@ -174,7 +174,7 @@ void json_load_file(const char* path) { int16_t children = -1; - for (i=0; i<(int)items; i+=2) + for (i=0; i<(unsigned int)items; i+=2) { //increment i on each successful tag + values combination, not individual tokens jsmntok_t* tag_t = tokens+i; |