From e208c6eba7a28e2d79a30d0876dd48af010a48e7 Mon Sep 17 00:00:00 2001
From: KO Myung-Hun <komh@chollian.net>
Date: Mon, 10 Oct 2011 20:44:18 +0900
Subject: [PATCH] Call vlc_CPU_init() when loading a DLL on OS/2 as Win32.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
---
 src/misc/cpu.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index 15de451c0d..e7e2281552 100644
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -325,7 +325,9 @@ out:
  */
 unsigned vlc_CPU (void)
 {
-#ifndef WIN32 /* On Windows, initialized from DllMain() instead */
+/* On Windows and OS/2,
+ * initialized from DllMain() and _DLL_InitTerm() respectively, instead */
+#if !defined(WIN32) && !defined(__OS2__)
     static pthread_once_t once = PTHREAD_ONCE_INIT;
     pthread_once (&once, vlc_CPU_init);
 #endif
-- 
2.39.5