diff options
| author | Michael Turvey <mwturvey@users.noreply.github.com> | 2018-01-15 22:43:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-15 22:43:02 -0700 |
| commit | 7755de9d2af61834568737594e29352b47176c7f (patch) | |
| tree | 0d9eea391f3b266bcb80c47131092e0dbf317600 /include/libsurvive/survive.h | |
| parent | 8be34f04a100defc9d1958aa4ce63ef02d19db69 (diff) | |
| parent | b2eb7569a8963917116c4520e15b17f0578a2509 (diff) | |
| download | libsurvive-7755de9d2af61834568737594e29352b47176c7f.tar.gz libsurvive-7755de9d2af61834568737594e29352b47176c7f.tar.bz2 | |
Merge pull request #95 from mwturvey/SmallChange
Resolve warnings & remove survive.h dependency on redist
Diffstat (limited to 'include/libsurvive/survive.h')
| -rw-r--r-- | include/libsurvive/survive.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/libsurvive/survive.h b/include/libsurvive/survive.h index 4821e63..3d0d472 100644 --- a/include/libsurvive/survive.h +++ b/include/libsurvive/survive.h @@ -4,7 +4,6 @@ #include <stdint.h> #include "survive_types.h" #include "poser.h" -#include "os_generic.h" #ifdef __cplusplus extern "C" { @@ -117,7 +116,7 @@ typedef struct { uint8_t nextReadIndex; //init to 0 uint8_t nextWriteIndex; // init to 0 - og_sema_t buttonservicesem; + void* buttonservicesem; ButtonQueueEntry entry[BUTTON_QUEUE_MAX_LEN]; } ButtonQueue; @@ -150,7 +149,7 @@ struct SurviveContext uint8_t isClosing; // flag to indicate if threads should terminate themselves - og_thread_t buttonservicethread; + void* buttonservicethread; ButtonQueue buttonQueue; }; |