From 023fa0761217ea46579a415e68f033678895904d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
Date: Thu, 24 Jan 2008 14:33:38 +0000
Subject: [PATCH] Reverts [24530] & [24531] (preprocessing related) , add
 $(DEFS) (-DHAVE_CONFIG_H) to moc command line

---
 modules/gui/qt4/Modules.am                        | 2 +-
 modules/gui/qt4/components/simple_preferences.hpp | 2 +-
 modules/gui/qt4/dialogs/help.hpp                  | 2 ++
 modules/gui/qt4/dialogs/vlm.hpp                   | 6 ++++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 48d3cfb74d..af90ecba23 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -71,7 +71,7 @@ resources.cpp: res.qrc
 	$(RCC) -name vlc -o $@ $<
 
 .hpp.moc.cpp:
-	$(MOC) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
+	$(MOC) $(DEFS) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
 
 .ui.h:
 	mkdir -p -- ui
diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index 47ab94154f..f705de552a 100644
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -116,7 +116,7 @@ private:
 private slots:
     void lastfm_Changed( int );
     void updateAudioOptions( int ); 
-#ifdef SYS_MINGW32
+#ifdef WIN32
     void assoDialog();
     void saveAsso();
 #endif
diff --git a/modules/gui/qt4/dialogs/help.hpp b/modules/gui/qt4/dialogs/help.hpp
index f5fae30e5f..e32930ac21 100644
--- a/modules/gui/qt4/dialogs/help.hpp
+++ b/modules/gui/qt4/dialogs/help.hpp
@@ -24,7 +24,9 @@
 #ifndef _HELP_DIALOG_H_
 #define _HELP_DIALOG_H_
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include "util/qvlcframe.hpp"
 
diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp
index 92f02bd212..c763cae820 100644
--- a/modules/gui/qt4/dialogs/vlm.hpp
+++ b/modules/gui/qt4/dialogs/vlm.hpp
@@ -25,14 +25,16 @@
 #ifndef _VLM_DIALOG_H_
 #define _VLM_DIALOG_H_
 
+#ifdef HAVE_CONFIG_H
 # include "config.h"
+#endif
 
 #include <vlc/vlc.h>
 
-#include <vlc_vlm.h>
-
 #ifdef ENABLE_VLM
 
+#include <vlc_vlm.h>
+
 #include "ui/vlm.h"
 #include "util/qvlcframe.hpp"
 
-- 
2.25.4