[vlc-commits] Call vlc_CPU_init() when loading a DLL on OS/2 as Win32.

[KO Myung-Hun]

vlc | branch: master | KO Myung-Hun <komh at chollian.net> | Mon Oct 10 20:44:18 2011 +0900| [e208c6eba7a28e2d79a30d0876dd48af010a48e7] | committer: Rémi Denis-Courmont

Call vlc_CPU_init() when loading a DLL on OS/2 as Win32.

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

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

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

diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index 15de451..e7e2281 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