summaryrefslogtreecommitdiff
path: root/include/xine/xine_internal.h
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2010-01-08 02:01:36 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2010-01-08 02:01:36 +0000
commit07df287814b0b7e6875debecdb51bdd496872812 (patch)
treea9caa62d0068f8969e659cef93ec610657dbc5e8 /include/xine/xine_internal.h
parent682ea4a0a64795c864c992fa09f795df0ec8f3ec (diff)
parente066b69435f814b48e7646c75e3db4b726bf5cf6 (diff)
downloadxine-lib-07df287814b0b7e6875debecdb51bdd496872812.tar.gz
xine-lib-07df287814b0b7e6875debecdb51bdd496872812.tar.bz2
Merge from 1.2 main.
Diffstat (limited to 'include/xine/xine_internal.h')
-rw-r--r--include/xine/xine_internal.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/include/xine/xine_internal.h b/include/xine/xine_internal.h
index 9f2e95aae..b12d20880 100644
--- a/include/xine/xine_internal.h
+++ b/include/xine/xine_internal.h
@@ -73,6 +73,11 @@ typedef struct xine_ticket_s xine_ticket_t;
* the "big" xine struct, holding everything together
*/
+#ifndef XDG_BASEDIR_H
+/* present here for internal convenience only */
+typedef struct { void *reserved; } xdgHandle;
+#endif
+
struct xine_s {
config_values_t *config;
@@ -92,8 +97,8 @@ struct xine_s {
metronom_clock_t *clock;
- /** Handle for libxdg-basedir functions. It's actually an xdgHandle. */
- void * basedir_handle;
+ /** Handle for libxdg-basedir functions. */
+ xdgHandle basedir_handle;
#ifdef XINE_ENGINE_INTERNAL
xine_ticket_t *port_ticket;