Move non-deprecated version functions out of the deprecated file
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Sat, 31 May 2008 18:36:40 +0000 (21:36 +0300)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Sat, 31 May 2008 18:36:40 +0000 (21:36 +0300)
src/Makefile.am
src/libvlc.c
src/version.c [new file with mode: 0644]

index fc95a0d..51e3230 100644 (file)
@@ -267,6 +267,7 @@ SOURCES_libvlc_common = \
        libvlc-common.c \
        libvlc.h \
        libvlc-module.c \
+       version.c \
        interface/interface.h \
        interface/interface.c \
        interface/intf_eject.c \
index 5cbf80e..2289add 100644 (file)
 #include <vlc_aout.h>
 #include <vlc_vout.h>
 
-/*****************************************************************************
- * VLC_Version: return the libvlc version.
- *****************************************************************************
- * This function returns full version string (numeric version and codename).
- *****************************************************************************/
-char const * VLC_Version( void )
-{
-    return VERSION_MESSAGE;
-}
-
-/*****************************************************************************
- * VLC_CompileBy, VLC_CompileHost, VLC_CompileDomain,
- * VLC_Compiler, VLC_Changeset
- *****************************************************************************/
-#define DECLARE_VLC_VERSION( func, var )                                    \
-char const * VLC_##func ( void )                                            \
-{                                                                           \
-    return VLC_##var ;                                                      \
-}
-
-DECLARE_VLC_VERSION( CompileBy, COMPILE_BY );
-DECLARE_VLC_VERSION( CompileHost, COMPILE_HOST );
-DECLARE_VLC_VERSION( CompileDomain, COMPILE_DOMAIN );
-DECLARE_VLC_VERSION( Compiler, COMPILER );
-
-extern const char psz_vlc_changeset[];
-const char* VLC_Changeset( void )
-{
-    return psz_vlc_changeset;
-}
-
 #define LIBVLC_FUNC \
     libvlc_int_t * p_libvlc = vlc_current_object( i_object ); \
     if( !p_libvlc ) return VLC_ENOOBJ;
diff --git a/src/version.c b/src/version.c
new file mode 100644 (file)
index 0000000..bc0cbe9
--- /dev/null
@@ -0,0 +1,62 @@
+/*****************************************************************************
+ * version.c: LibVLC version infos
+ *****************************************************************************
+ * Copyright (C) 1998-2008 the VideoLAN team
+ *
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
+ *          Samuel Hocevar <sam@zoy.org>
+ *          Gildas Bazin <gbazin@videolan.org>
+ *          Derk-Jan Hartman <hartman at videolan dot org>
+ *          Rémi Denis-Courmont <rem # videolan : org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc/vlc.h>
+
+/*****************************************************************************
+ * VLC_Version: return the libvlc version.
+ *****************************************************************************
+ * This function returns full version string (numeric version and codename).
+ *****************************************************************************/
+char const * VLC_Version( void )
+{
+    return VERSION_MESSAGE;
+}
+
+/*****************************************************************************
+ * VLC_CompileBy, VLC_CompileHost, VLC_CompileDomain,
+ * VLC_Compiler, VLC_Changeset
+ *****************************************************************************/
+#define DECLARE_VLC_VERSION( func, var )                                    \
+char const * VLC_##func ( void )                                            \
+{                                                                           \
+    return VLC_##var ;                                                      \
+}
+
+DECLARE_VLC_VERSION( CompileBy, COMPILE_BY );
+DECLARE_VLC_VERSION( CompileHost, COMPILE_HOST );
+DECLARE_VLC_VERSION( CompileDomain, COMPILE_DOMAIN );
+DECLARE_VLC_VERSION( Compiler, COMPILER );
+
+extern const char psz_vlc_changeset[];
+const char* VLC_Changeset( void )
+{
+    return psz_vlc_changeset;
+}