diff options
| author | Justin Berger <j.david.berger@gmail.com> | 2018-03-28 00:59:48 -0600 |
|---|---|---|
| committer | Justin Berger <j.david.berger@gmail.com> | 2018-03-28 00:59:48 -0600 |
| commit | f7e356d1237dfd987aaf46327e23b35e1cd31b95 (patch) | |
| tree | 58374e90766513f93d0c712681aaffcc9a0b4e69 /redist | |
| parent | 8ff886d4f48871e9d263b5cfc2a8c842b32690a9 (diff) | |
| parent | bf92b059271e7be0db6f91660ad8abd1c71e8e73 (diff) | |
| download | libsurvive-f7e356d1237dfd987aaf46327e23b35e1cd31b95.tar.gz libsurvive-f7e356d1237dfd987aaf46327e23b35e1cd31b95.tar.bz2 | |
Merge branch 'time_based_disambiguator' - Now referred to as 'state based disambiguator'
Diffstat (limited to 'redist')
| -rw-r--r-- | redist/os_generic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/redist/os_generic.h b/redist/os_generic.h index 853440a..0d1c7e7 100644 --- a/redist/os_generic.h +++ b/redist/os_generic.h @@ -214,7 +214,7 @@ OSG_INLINE og_thread_t OGCreateThread(void *(routine)(void *), void *parameter) return (og_thread_t)ret; } -static void *OGJoinThread(og_thread_t ot) { +OSG_INLINE void *OGJoinThread(og_thread_t ot) { void *retval; if (!ot) { return 0; |