Removes trailing spaces. Removes tabs.

[vlc] / src / misc / win32_specific.c

diff --git a/src/misc/win32_specific.c b/src/misc/win32_specific.c
index 75b5fee4aae1b87cdc058c851b0f5b8ffafe74fd..ff3c5e47dd8b26f9b20e87b8baaf2b19ca75136d 100644 (file)
--- a/src/misc/win32_specific.c
+++ b/src/misc/win32_specific.c
@@ -21,8 +21,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-#include <string.h>                                              /* strdup() */
-#include <stdlib.h>                                                /* free() */
 
 #include <vlc/vlc.h>
 #include "../libvlc.h"
@@ -75,7 +73,7 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] )
 
 #ifndef HAVE_RELEASE
     {
-        /* remove trailing \.libs from executable dir path if seen, 
+        /* remove trailing \.libs from executable dir path if seen,
            we assume we are running vlc through libtool wrapper in build dir */
         int offset  = strlen(psz_path)-sizeof("\\.libs")+1;
         if( offset > 0 )
@@ -86,7 +84,7 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] )
     }
 #endif
 
-    vlc_global( p_this )->psz_vlcpath = strdup( psz_path );
+    vlc_global()->psz_vlcpath = strdup( psz_path );
 
     /* Set the default file-translation mode */
 #if !defined( UNDER_CE )
@@ -362,10 +360,10 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam,
  *****************************************************************************/
 void system_End( libvlc_int_t *p_this )
 {
-    if( p_this && p_this->p_libvlc_global && vlc_global( p_this )->psz_vlcpath )
+    if( p_this && vlc_global() )
     {
-        free( vlc_global( p_this )->psz_vlcpath );
-        vlc_global( p_this )->psz_vlcpath = NULL;
+        free( vlc_global()->psz_vlcpath );
+        vlc_global()->psz_vlcpath = NULL;
     }
 
     WSACleanup();