Merge from 1.2.

1 files changed, 17 insertions, 10 deletions

diff --git a/include/xine/input_plugin.h b/include/xine/input_plugin.h
index 2917721c9..e434dc5a8 100644
--- a/include/xine/input_plugin.h
+++ b/include/xine/input_plugin.h
@@ -23,16 +23,13 @@
 
 #include <sys/types.h>
 
+#include <xine/os_types.h>
+#include <xine/xineutils.h>
+#include <xine/buffer.h>
+#include <xine/configfile.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>
+#  include <xine/plugin_catalog.h>
 #endif
 
 #define INPUT_PLUGIN_IFACE_VERSION   18
@@ -228,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
 
 };