From 689b72ce2467bcea3ee8e966a10634022dacc190 Mon Sep 17 00:00:00 2001
From: woro <woro@e10066b5-e1e2-0310-b819-94efdf66514b>
Date: Mon, 18 Feb 2008 23:06:29 +0000
Subject: better fix for making sure the core vdr does not redefine swap

git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@1031 e10066b5-e1e2-0310-b819-94efdf66514b
---
 mg_item_gd.c          | 3 ---
 mg_setup.c            | 1 -
 mg_tools.c            | 1 +
 muggle.c              | 1 +
 vdr_actions.c         | 1 +
 vdr_decoder_sndfile.c | 1 +
 vdr_menu.c            | 1 +
 vdr_player.c          | 1 +
 8 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mg_item_gd.c b/mg_item_gd.c
index 274f11e..479c2ca 100644
--- a/mg_item_gd.c
+++ b/mg_item_gd.c
@@ -18,9 +18,6 @@
 #include "mg_tools.h"
 #include "mg_db.h"
 
-// this one last because of swap() redefinition:
-// #include <vdr/tools.h>
-
 static bool gd_music_dir_exists[100];
 static bool gd_music_dirs_scanned=false;
 
diff --git a/mg_setup.c b/mg_setup.c
index 01c22b2..8a395de 100644
--- a/mg_setup.c
+++ b/mg_setup.c
@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <string>
 #include <getopt.h>
-// #include <vdr/tools.h>
 
 mgSetup the_setup;
 
diff --git a/mg_tools.c b/mg_tools.c
index 20595c5..a456377 100644
--- a/mg_tools.c
+++ b/mg_tools.c
@@ -15,6 +15,7 @@
 
 #include "mg_tools.h"
 
+#define __STL_CONFIG_H
 #include <vdr/tools.h>
 
 //! \brief buffer for messages
diff --git a/muggle.c b/muggle.c
index b60009b..be65d3a 100644
--- a/muggle.c
+++ b/muggle.c
@@ -17,6 +17,7 @@
 #include "mg_tools.h"
 
 #include "i18n.h"
+#define __STL_CONFIG_H
 #include <vdr/tools.h>
 #include <vdr/config.h>
 
diff --git a/vdr_actions.c b/vdr_actions.c
index 41ffa95..0ac1da0 100644
--- a/vdr_actions.c
+++ b/vdr_actions.c
@@ -19,6 +19,7 @@
 #include <assert.h>
 
 #include <vdr/menuitems.h>
+#define __STL_CONFIG_H
 #include <vdr/tools.h>
 #include <vdr/plugin.h>
 
diff --git a/vdr_decoder_sndfile.c b/vdr_decoder_sndfile.c
index a906df1..aad74dc 100644
--- a/vdr_decoder_sndfile.c
+++ b/vdr_decoder_sndfile.c
@@ -35,6 +35,7 @@
 #include "vdr_decoder_sndfile.h"
 #include "i18n.h"
 
+#define __STL_CONFIG_H
 #include <vdr/tools.h>
 
 #ifndef SNDFILE_1
diff --git a/vdr_menu.c b/vdr_menu.c
index 48a7b2c..3a48577 100644
--- a/vdr_menu.c
+++ b/vdr_menu.c
@@ -17,6 +17,7 @@
 #include <vector>
 
 #include <vdr/menuitems.h>
+#define __STL_CONFIG_H
 #include <vdr/tools.h>
 #include <vdr/config.h>
 #include <vdr/plugin.h>
diff --git a/vdr_player.c b/vdr_player.c
index d911ddf..19c8502 100644
--- a/vdr_player.c
+++ b/vdr_player.c
@@ -34,6 +34,7 @@
 #include <vdr/device.h>
 #include <vdr/thread.h>
 #include <vdr/ringbuffer.h>
+#define __STL_CONFIG_H
 #include <vdr/tools.h>
 #include <vdr/recording.h>
 #include <vdr/status.h>
-- 
cgit v1.2.3