* libvlc.h: hopefully fix a few warnings.

* win32_specific.c, threads.c: fix win32 compilation.

diff --git a/src/libvlc.h b/src/libvlc.h
index 5c0fac3e0f46fdb54906ad9f12966e271677ff5a..8516a9082886c212ead49c41fc7bf51cfdb71b0b 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -74,7 +74,8 @@ struct libvlc_global_data_t
 #endif
 };
 
-static inline libvlc_global_data_t *vlc_global( vlc_object_t *p_this )
+#define vlc_global( a ) __vlc_global( VLC_OBJECT( a ) )
+static inline libvlc_global_data_t *__vlc_global( vlc_object_t *p_this )
 {
     return (libvlc_global_data_t *)p_this->p_libvlc_global;
 }

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 26b8819e27428afabf46206a545b12eec158c946..4d67bdb08f7a9591ff4db8814a42c4babea43a31 100644 (file)
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -74,6 +74,8 @@ int __vlc_threads_init( vlc_object_t *p_this )
 #elif defined( ST_INIT_IN_ST_H )
 #elif defined( UNDER_CE )
 #elif defined( WIN32 )
+    b_fast_mutex = config_GetInt( p_this, "fast-mutex" );
+    i_win9x_cv = config_GetInt( p_this, "win9x-cv-method" );
 #elif defined( HAVE_KERNEL_SCHEDULER_H )
 #elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
     pthread_mutex_lock( &once_mutex );

diff --git a/src/misc/win32_specific.c b/src/misc/win32_specific.c
index 7ca77575e75bb50f6c367ca940393ddd671f8b53..deb7208d52acec803f033bf9d2bf861c7b12f1d7 100644 (file)
--- a/src/misc/win32_specific.c
+++ b/src/misc/win32_specific.c
@@ -121,9 +121,6 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND, UINT, WPARAM, LPARAM );
 void system_Configure( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] )
 {
 #if !defined( UNDER_CE )
-    p_this->p_libvlc_global->b_fast_mutex = config_GetInt( p_this, "fast-mutex" );
-    p_this->p_libvlc_global->i_win9x_cv = config_GetInt( p_this, "win9x-cv-method" );
-
     /* Raise default priority of the current process */
 #ifndef ABOVE_NORMAL_PRIORITY_CLASS
 #   define ABOVE_NORMAL_PRIORITY_CLASS 0x00008000