* modules/gui/skins/src/*: compilation fixes under win32.

diff --git a/modules/gui/skins/src/skin_main.cpp b/modules/gui/skins/src/skin_main.cpp
index 617ff7690e00a5100544850ffdde59bcf7873fc2..83620d89fab5a4295eac2cfd6af0a6bc070ae491 100644 (file)
--- a/modules/gui/skins/src/skin_main.cpp
+++ b/modules/gui/skins/src/skin_main.cpp
@@ -2,7 +2,7 @@
  * skin-main.cpp: skins plugin for VLC
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: skin_main.cpp,v 1.24 2003/05/02 15:53:32 gbazin Exp $
+ * $Id: skin_main.cpp,v 1.25 2003/05/05 12:15:25 gbazin Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -30,6 +30,12 @@
 
 //--- GENERAL ---------------------------------------------------------------
 #ifndef BASIC_SKINS
+#ifdef WIN32                                               /* mingw32 hack */
+#   undef Yield
+#   undef CreateDialog
+#endif
+/* Let vlc take care of the i18n stuff */
+#define WXINTL_NO_GETTEXT_MACRO
 #include <wx/wx.h>
 #endif
 

diff --git a/modules/gui/skins/src/vlcproc.cpp b/modules/gui/skins/src/vlcproc.cpp
index 935d70875d0d7a620d8ecdb1d24870fd135574a1..ea5c2857e6a7a30197c3ee34e5d2088c8a29afab 100644 (file)
--- a/modules/gui/skins/src/vlcproc.cpp
+++ b/modules/gui/skins/src/vlcproc.cpp
@@ -2,7 +2,7 @@
  * vlcproc.cpp: VlcProc class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: vlcproc.cpp,v 1.18 2003/05/02 15:53:32 gbazin Exp $
+ * $Id: vlcproc.cpp,v 1.19 2003/05/05 12:15:25 gbazin Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -30,6 +30,12 @@
 #include <vlc/vout.h>
 
 #ifndef BASIC_SKINS
+#ifdef WIN32                                               /* mingw32 hack */
+#   undef Yield
+#   undef CreateDialog
+#endif
+/* Let vlc take care of the i18n stuff */
+#define WXINTL_NO_GETTEXT_MACRO
 #include <wx/wx.h>
 #endif
 

diff --git a/modules/gui/skins/win32/win32_run.cpp b/modules/gui/skins/win32/win32_run.cpp
index 6fdbdd6c1bf5a50baf41bf2692c313cfff1dc8e0..b6d4c1d84ec8bfd8962ea7fbf3715a17b512716b 100644 (file)
--- a/modules/gui/skins/win32/win32_run.cpp
+++ b/modules/gui/skins/win32/win32_run.cpp
@@ -2,7 +2,7 @@
  * win32_run.cpp:
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: win32_run.cpp,v 1.14 2003/05/02 15:53:32 gbazin Exp $
+ * $Id: win32_run.cpp,v 1.15 2003/05/05 12:15:25 gbazin Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -31,8 +31,15 @@
 
 //--- GENERAL ---------------------------------------------------------------
 #ifndef BASIC_SKINS
+#ifdef WIN32                                               /* mingw32 hack */
+#   undef Yield
+#   undef CreateDialog
+#endif
+/* Let vlc take care of the i18n stuff */
+#define WXINTL_NO_GETTEXT_MACRO
 #include <wx/wx.h>
 #endif
+
 #include <windows.h>
 
 //--- SKIN ------------------------------------------------------------------