[vlc-commits] Fix compilation error due to pthread on OS/2
KO Myung-Hun
git at videolan.org
Thu Dec 15 23:57:23 CET 2011
vlc/vlc-1.2 | branch: master | KO Myung-Hun <komh78 at gmail.com> | Thu Dec 8 20:48:20 2011 +0900| [80945fa4d93182a7b92db7946ff2dc15d17a5e04] | committer: Jean-Baptiste Kempf
Fix compilation error due to pthread on OS/2
Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
(cherry picked from commit b5b1c1906f7db9fa9d7dce5ecc331ab4bbb793f8)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=80945fa4d93182a7b92db7946ff2dc15d17a5e04
---
bin/vlc.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/bin/vlc.c b/bin/vlc.c
index 6969a1b..4d20f89 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -35,13 +35,20 @@
#include <stdbool.h>
#include <locale.h>
#include <signal.h>
-#include <pthread.h>
+#ifdef HAVE_PTHREAD_H
+# include <pthread.h>
+#endif
#include <unistd.h>
#ifdef __APPLE__
#include <string.h>
#endif
+#ifdef __OS2__
+# define pthread_t int
+# define pthread_self() _gettid()
+#endif
+
/* Explicit HACK */
extern void LocaleFree (const char *);
More information about the vlc-commits
mailing list