diff options
| author | Johann Koenig <johannkoenig@google.com> | 2016-06-07 21:43:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-07 21:43:55 +0000 |
| commit | ef1fb6deb4badfe9f78e7e623800b92db0915152 (patch) | |
| tree | 736391fe7c475ced00648671cf25268d30d93552 /vp8 | |
| parent | 3de42ac27bee4efdc83be55fca73ae7c78c0b97b (diff) | |
| parent | 72e332f767a2278860633c5b66b02efab143116a (diff) | |
| download | libvpx-ef1fb6deb4badfe9f78e7e623800b92db0915152.tar libvpx-ef1fb6deb4badfe9f78e7e623800b92db0915152.tar.gz libvpx-ef1fb6deb4badfe9f78e7e623800b92db0915152.tar.bz2 libvpx-ef1fb6deb4badfe9f78e7e623800b92db0915152.zip | |
Merge changes I999ef597,Ic6dc9f53
* changes:
configure: Add -mstackrealign flags to CFLAGS on OS/2
vpx: Add OS/2-specific threading codes
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/common/threading.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/common/threading.h b/vp8/common/threading.h index c00e517a7..183b49b8f 100644 --- a/vp8/common/threading.h +++ b/vp8/common/threading.h @@ -44,8 +44,8 @@ extern "C" { #include <os2.h> #include <stdlib.h> -#define THREAD_FUNCTION void -#define THREAD_FUNCTION_RETURN void +#define THREAD_FUNCTION void * +#define THREAD_FUNCTION_RETURN void * #define THREAD_SPECIFIC_INDEX PULONG #define pthread_t TID #define pthread_attr_t ULONG |