[vlc-commits] Disable check_OS_capability() on OS/2

[KO Myung-Hun]

vlc | branch: master | KO Myung-Hun <komh at chollian.net> | Sat Mar 12 11:16:23 2011 +0900| [bb338c69dbd1c2b8ffc68e80a0303e95d71cd2ce] | committer: Rémi Denis-Courmont

Disable check_OS_capability() on OS/2

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bb338c69dbd1c2b8ffc68e80a0303e95d71cd2ce
---

 src/misc/cpu.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index e7e2281..0b0673a 100644
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -53,7 +53,7 @@ static uint32_t cpu_flags;
 
 #if defined( __i386__ ) || defined( __x86_64__ ) || defined( __powerpc__ ) \
  || defined( __ppc__ ) || defined( __ppc64__ ) || defined( __powerpc64__ )
-# ifndef WIN32
+# if !defined( WIN32 ) && !defined( __OS2__ )
 static bool check_OS_capability( const char *psz_capability, pid_t pid )
 {
     int status;
@@ -86,7 +86,7 @@ static bool check_OS_capability( const char *psz_capability, pid_t pid )
             i_capabilities |= (flag);                   \
      } while(0)
 
-# else /* WIN32 */
+# else /* WIN32 || __OS2__ */
 #  define check_capability(name, flag, code, input)   \
         i_capabilities |= (flag);
 # endif