diff options
| author | mwturvey <michael.w.turvey@intel.com> | 2017-03-17 14:41:59 -0700 |
|---|---|---|
| committer | mwturvey <michael.w.turvey@intel.com> | 2017-03-17 14:41:59 -0700 |
| commit | b6981854dff11022e3de56e56cbf4633f1c49598 (patch) | |
| tree | f5b8f4ff1425f704d791d5b9af9c8af65455868d /redist/os_generic.c | |
| parent | 94be8ccdbfb2f44c9bc569428537444030ba8eeb (diff) | |
| parent | a53c520c2d1a3bb9faa4cb5e4ee9ccc48bb1835f (diff) | |
| download | libsurvive-b6981854dff11022e3de56e56cbf4633f1c49598.tar.gz libsurvive-b6981854dff11022e3de56e56cbf4633f1c49598.tar.bz2 | |
Merge branch 'master' into UsbTrackerOnWin
# Conflicts:
# src/survive_vive.c
Diffstat (limited to 'redist/os_generic.c')
| -rw-r--r-- | redist/os_generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/redist/os_generic.c b/redist/os_generic.c index 0993d7a..1ab4863 100644 --- a/redist/os_generic.c +++ b/redist/os_generic.c @@ -55,6 +55,7 @@ void * OGJoinThread( og_thread_t ot ) { WaitForSingleObject( ot, INFINITE ); CloseHandle( ot ); + return 0; } void OGCancelThread( og_thread_t ot ) |