vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Sat Mar 3 18:15:06 2018 +0200| [1beb944ffffb224d7a1020f9629c570b498ed0b2] | committer: Rémi Denis-Courmont
config: unexport config_Get(Data|Lib)Dir() > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1beb944ffffb224d7a1020f9629c570b498ed0b2 --- include/vlc_configuration.h | 28 ---------------------------- src/config/configuration.h | 28 ++++++++++++++++++++++++++++ src/libvlccore.sym | 2 -- 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h index f0906da03a..a4854126a3 100644 --- a/include/vlc_configuration.h +++ b/include/vlc_configuration.h @@ -270,34 +270,6 @@ VLC_API void config_ResetAll(void); VLC_API module_config_t *config_FindConfig(const char *name) VLC_USED; /** - * Gets the arch-independent installation directory. - * - * This function determines the directory containing the - * architecture-independent installed asset files (such as image, text and - * message translation tables). - * - * See also config_GetLibDir(). - * - * @return a heap-allocated string (use free() to release it), or NULL on error - */ -VLC_API char *config_GetDataDir(void) VLC_USED VLC_MALLOC; - -/** - * Gets the arch-specific installation directory. - * - * This function determines the directory containing the architecture-specific - * installed asset files (such as executable plugins and compiled byte code). - * - * See also config_GetDataDir(). - * - * \note config_GetDataDir() and config_GetLibDir() may or may not return the - * same path, depending on conventions of the operating system. - * - * @return a heap-allocated string (use free() to release it), or NULL on error - */ -VLC_API char *config_GetLibDir(void) VLC_USED VLC_MALLOC; - -/** * System directory identifiers */ typedef enum vlc_system_dir diff --git a/src/config/configuration.h b/src/config/configuration.h index dd02c7f4af..f8489e607a 100644 --- a/src/config/configuration.h +++ b/src/config/configuration.h @@ -55,6 +55,34 @@ extern bool config_dirty; bool config_IsSafe (const char *); +/** + * Gets the arch-independent installation directory. + * + * This function determines the directory containing the + * architecture-independent installed asset files (such as image, text and + * message translation tables). + * + * See also config_GetLibDir(). + * + * @return a heap-allocated string (use free() to release it), or NULL on error + */ +char *config_GetDataDir(void) VLC_USED VLC_MALLOC; + +/** + * Gets the arch-specific installation directory. + * + * This function determines the directory containing the architecture-specific + * installed asset files (such as executable plugins and compiled byte code). + * + * See also config_GetDataDir(). + * + * \note config_GetDataDir() and config_GetLibDir() may or may not return the + * same path, depending on conventions of the operating system. + * + * @return a heap-allocated string (use free() to release it), or NULL on error + */ +char *config_GetLibDir(void) VLC_USED VLC_MALLOC; + /* The configuration file */ #define CONFIG_FILE "vlcrc" diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 6ed142207e..b119285cdb 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -51,8 +51,6 @@ config_ChainParse config_ChainParseOptions config_ExistIntf config_FindConfig -config_GetDataDir -config_GetLibDir config_GetFloat config_GetSysPath config_GetUserDir _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits