From a3ded7d74f5e8bb08f4fc25ff75ca6b534c633dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Sun, 23 Dec 2007 18:44:29 +0100
Subject: Remove XINE_COMPILE conditionals where they just changed the include
 directive paths.

---
 include/xine/input_plugin.h | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'include/xine/input_plugin.h')

diff --git a/include/xine/input_plugin.h b/include/xine/input_plugin.h
index 2917721c9..aa0e2bf47 100644
--- a/include/xine/input_plugin.h
+++ b/include/xine/input_plugin.h
@@ -23,17 +23,10 @@
 
 #include <sys/types.h>
 
-#ifdef XINE_COMPILE
-#  include <inttypes.h>
-#  include "xineutils.h"
-#  include "buffer.h"
-#  include "configfile.h"
-#else
-#  include <xine/os_types.h>
-#  include <xine/xineutils.h>
-#  include <xine/buffer.h>
-#  include <xine/configfile.h>
-#endif
+#include <xine/os_types.h>
+#include <xine/xineutils.h>
+#include <xine/buffer.h>
+#include <xine/configfile.h>
 
 #define INPUT_PLUGIN_IFACE_VERSION   18
  
-- 
cgit v1.2.3


From 057be3a11b092f1a1333e62945060cbb5c7ee59e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Sun, 23 Dec 2007 18:54:49 +0100
Subject: Make the node pointer transparent during xine build.

Check XINE_COMPILE definition, if it's present, define node as a plugin_node_t pointer rather than a void pointer.
---
 include/xine/input_plugin.h | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'include/xine/input_plugin.h')

diff --git a/include/xine/input_plugin.h b/include/xine/input_plugin.h
index aa0e2bf47..e434dc5a8 100644
--- a/include/xine/input_plugin.h
+++ b/include/xine/input_plugin.h
@@ -28,6 +28,10 @@
 #include <xine/buffer.h>
 #include <xine/configfile.h>
 
+#ifdef XINE_COMPILE
+#  include <xine/plugin_catalog.h>
+#endif
+
 #define INPUT_PLUGIN_IFACE_VERSION   18
  
 typedef struct input_class_s input_class_t ;
@@ -221,7 +225,17 @@ struct input_plugin_s {
 
   input_class_t *input_class;
 
-  void *node; /* used by plugin loader */
+  /**
+   * @brief Pointer to the loaded plugin node.
+   *
+   * Used by the plugins loader. It's an opaque type when using the
+   * structure outside of xine's build.
+   */
+#ifdef XINE_COMPILE
+  plugin_node_t *node;
+#else
+  void *node;
+#endif
 
 };
 
-- 
cgit v1.2.3