diff options
| author | cnlohr <lohr85@gmail.com> | 2016-12-20 23:39:58 -0500 |
|---|---|---|
| committer | cnlohr <lohr85@gmail.com> | 2016-12-20 23:39:58 -0500 |
| commit | 2bce90b5a5095c2327bbbba1d0cc4fdb38426ce0 (patch) | |
| tree | a3a955f85472f8888e2837eff821e2dc1f2219e8 /include | |
| parent | 0fb1ec7b12f5c0dbe8e82d7d029e900751fc6c6a (diff) | |
| parent | 170219fe413602508b31c39df23c8938adc6c35f (diff) | |
| download | libsurvive-2bce90b5a5095c2327bbbba1d0cc4fdb38426ce0.tar.gz libsurvive-2bce90b5a5095c2327bbbba1d0cc4fdb38426ce0.tar.bz2 | |
Merge branch 'jpicht-disambiguate'
Diffstat (limited to 'include')
| -rw-r--r-- | include/survive.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/survive.h b/include/survive.h index f64091f..8ce5404 100644 --- a/include/survive.h +++ b/include/survive.h @@ -31,10 +31,14 @@ struct SurviveObject //Flood info, for calculating which laser is currently sweeping. int8_t oldcode; +#ifdef USE_OLD_DISAMBIGUATOR int16_t total_photos; int32_t last_photo_time; int32_t total_photo_time; int32_t total_pulsecode_time; +#else + struct disambiguator * d; +#endif }; typedef void (*text_feedback_fnptr)( struct SurviveContext * ctx, const char * fault ); |