Compilation fixes

diff --git a/modules/gui/skins/src/themeloader.cpp b/modules/gui/skins/src/themeloader.cpp
index 916138261879f9c225e0a3d658237f3ef301d8c8..d221bf7b1f6f2538f4b4bdd12e9d144cd6ba15c8 100644 (file)
--- a/modules/gui/skins/src/themeloader.cpp
+++ b/modules/gui/skins/src/themeloader.cpp
@@ -2,7 +2,7 @@
  * themeloader.cpp: ThemeLoader class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: themeloader.cpp,v 1.1 2003/03/18 02:21:47 ipkiss Exp $
+ * $Id: themeloader.cpp,v 1.2 2003/03/18 04:56:58 ipkiss Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -28,15 +28,15 @@
 #include <string>
 #include <fcntl.h>
 
+//--- VLC -------------------------------------------------------------------
+#include <vlc/vlc.h>
+#include <vlc/intf.h>
+
 #if defined( HAVE_LIBTAR_H ) && defined( HAVE_ZLIB_H )
 #   include <zlib.h>
 #   include <libtar.h>
 #endif
 
-//--- VLC -------------------------------------------------------------------
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
-
 //--- SKIN ------------------------------------------------------------------
 #include "os_api.h"
 #include "theme.h"

diff --git a/modules/gui/skins/src/themeloader.h b/modules/gui/skins/src/themeloader.h
index 4f753d2713e685fff12b0f29479fa93947c91b5a..a510ec487b5c04629dc980a2560c012618defd45 100644 (file)
--- a/modules/gui/skins/src/themeloader.h
+++ b/modules/gui/skins/src/themeloader.h
@@ -2,7 +2,7 @@
  * themeloader.h: ThemeLoader class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: themeloader.h,v 1.1 2003/03/18 02:21:47 ipkiss Exp $
+ * $Id: themeloader.h,v 1.2 2003/03/18 04:56:58 ipkiss Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -40,7 +40,7 @@ class ThemeLoader
     private:
         intf_thread_t *p_intf;
 
-#ifdef HAVE_LIBTAR_LIBZ
+#if defined( HAVE_LIBTAR_H ) && defined( HAVE_ZLIB_H )
         bool ExtractTarGz( const string tarfile, const string rootdir );
         bool Extract( const string FileName );
         void DeleteTempFiles( const string Path );

diff --git a/modules/gui/skins/win32/win32_dragdrop.cpp b/modules/gui/skins/win32/win32_dragdrop.cpp
index af3547b6bec26121feb2d56ac9e78427f6c6b8a4..d39be9f832fc538ed2bcf8f452d7eddbc5589015 100644 (file)
--- a/modules/gui/skins/win32/win32_dragdrop.cpp
+++ b/modules/gui/skins/win32/win32_dragdrop.cpp
@@ -2,7 +2,7 @@
  * win32_dragdrop.cpp: Win32 implementation of the drag & drop
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: win32_dragdrop.cpp,v 1.1 2003/03/18 02:21:47 ipkiss Exp $
+ * $Id: win32_dragdrop.cpp,v 1.2 2003/03/18 04:56:58 ipkiss Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -24,10 +24,6 @@
  *****************************************************************************/
 
 
-//--- GENERAL ---------------------------------------------------------------
-#include <list>
-using namespace std;
-
 //--- WIN32 -----------------------------------------------------------------
 #include <windows.h>