From a29a4e2e57c454027d791cdd8c69948ed03643e0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Cl=C3=A9ment=20Stenac?= <zorglub@videolan.org>
Date: Sun, 26 Nov 2006 15:36:01 +0000
Subject: [PATCH] Did I loose the count ?

---
 include/vlc_configuration.h  | 2 ++
 include/vlc_symbols.h        | 3 +++
 modules/access/vcdx/access.c | 3 ++-
 modules/access/vcdx/demux.c  | 3 ++-
 modules/access/vcdx/intf.h   | 3 +++
 modules/misc/notify/xosd.c   | 4 +++-
 src/misc/configuration.h     | 1 -
 7 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index ec8ec4a80d..bdbb110264 100644
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -229,6 +229,8 @@ VLC_EXPORT( module_t *, config_FindModule,( vlc_object_t *, const char * ) );
 
 VLC_EXPORT( int, config_Duplicate,( module_t *, const module_config_t *, size_t ));
 
+VLC_EXPORT(const char *, config_GetDataDir, ( const vlc_object_t * ));
+
 #define config_GetType(a,b) __config_GetType(VLC_OBJECT(a),b)
 #define config_GetInt(a,b) __config_GetInt(VLC_OBJECT(a),b)
 #define config_PutInt(a,b,c) __config_PutInt(VLC_OBJECT(a),b,c)
diff --git a/include/vlc_symbols.h b/include/vlc_symbols.h
index 4cc2ac22e8..5248c0bb1e 100644
--- a/include/vlc_symbols.h
+++ b/include/vlc_symbols.h
@@ -452,6 +452,7 @@ struct module_symbols_t
     int (*vout_Snapshot_inner) (vout_thread_t *p_vout, picture_t *p_pic);
     void (*streaming_GuiDescToChain_inner) (vlc_object_t*, sout_chain_t*, sout_gui_descr_t*);
     input_item_t* (*input_GetItem_inner) (input_thread_t*);
+    const char * (*config_GetDataDir_inner) (const vlc_object_t *);
 };
 # if defined (__PLUGIN__)
 #  define aout_OutputNextBuffer (p_symbols)->aout_OutputNextBuffer_inner
@@ -887,6 +888,7 @@ struct module_symbols_t
 #  define vout_Snapshot (p_symbols)->vout_Snapshot_inner
 #  define streaming_GuiDescToChain (p_symbols)->streaming_GuiDescToChain_inner
 #  define input_GetItem (p_symbols)->input_GetItem_inner
+#  define config_GetDataDir (p_symbols)->config_GetDataDir_inner
 # elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
 /******************************************************************
  * STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access.
@@ -1325,6 +1327,7 @@ struct module_symbols_t
     ((p_symbols)->vout_Snapshot_inner) = vout_Snapshot; \
     ((p_symbols)->streaming_GuiDescToChain_inner) = streaming_GuiDescToChain; \
     ((p_symbols)->input_GetItem_inner) = input_GetItem; \
+    ((p_symbols)->config_GetDataDir_inner) = config_GetDataDir; \
 
 # endif /* __PLUGIN__ */
 #endif /* __VLC_SYMBOLS_H */
diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c
index 6f05a3c90b..c8cb59126f 100644
--- a/modules/access/vcdx/access.c
+++ b/modules/access/vcdx/access.c
@@ -31,7 +31,8 @@
 
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
-#include <<vlc_input.h>>
+#include <vlc_input.h>
+#include <vlc_access.h>
 #include "vlc_keys.h"
 
 #include <cdio/cdio.h>
diff --git a/modules/access/vcdx/demux.c b/modules/access/vcdx/demux.c
index 55d1c6af42..919abcaa31 100644
--- a/modules/access/vcdx/demux.c
+++ b/modules/access/vcdx/demux.c
@@ -29,7 +29,8 @@
 #include <string.h>
 
 #include <vlc/vlc.h>
-#include <<vlc_input.h>>
+#include <vlc_input.h>
+#include <vlc_access.h>
 #include <vlc_interface.h>
 
 #ifdef HAVE_UNISTD_H
diff --git a/modules/access/vcdx/intf.h b/modules/access/vcdx/intf.h
index d8196f7529..de177c191f 100644
--- a/modules/access/vcdx/intf.h
+++ b/modules/access/vcdx/intf.h
@@ -21,6 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include <vlc/vlc.h>
+#include <vlc_input.h>
+
 /*****************************************************************************
  * intf_sys_t: description and status of interface
  *****************************************************************************/
diff --git a/modules/misc/notify/xosd.c b/modules/misc/notify/xosd.c
index cd4621dd10..9ad7c05551 100644
--- a/modules/misc/notify/xosd.c
+++ b/modules/misc/notify/xosd.c
@@ -28,7 +28,9 @@
 #include <string.h>
 
 #include <xosd.h>
-
+#include <vlc/vlc.h>
+#include <vlc_playlist.h>
+#include <vlc_item.h>
 #include <vlc_interface.h>
 
 #ifdef HAVE_UNISTD_H
diff --git a/src/misc/configuration.h b/src/misc/configuration.h
index 349f97a154..e8f26a9aeb 100644
--- a/src/misc/configuration.h
+++ b/src/misc/configuration.h
@@ -14,5 +14,4 @@ void config_UnsetCallbacks ( module_config_t *, size_t );
 int   __config_LoadCmdLine  ( vlc_object_t *, int *, char *[], vlc_bool_t );
 char *   config_GetHomeDir     ( void );
 char *   config_GetUserDir     ( void );
-const char * config_GetDataDir ( const vlc_object_t * );
 int    __config_LoadConfigFile ( vlc_object_t *, const char * );
-- 
2.39.2