From 9a31b3864cd9d8d3e99e02fba17c28053919ce3f Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 11 Sep 2011 09:03:43 +0000 Subject: [PATCH] Move definition of EbmlCodeVersion into the library git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libebml@803 a6f86f6d-0131-4f8e-9e7b-e335508773d5 --- ebml/EbmlVersion.h | 4 +-- src/EbmlVersion.cpp | 85 +++++++++++++++++++++++---------------------- 2 files changed, 46 insertions(+), 43 deletions(-) diff --git a/ebml/EbmlVersion.h b/ebml/EbmlVersion.h index 5cd6582..3e08679 100644 --- a/ebml/EbmlVersion.h +++ b/ebml/EbmlVersion.h @@ -44,8 +44,8 @@ START_LIBEBML_NAMESPACE #define LIBEBML_VERSION 0x010202 -static const std::string EbmlCodeVersion = "1.2.2"; -static const std::string EbmlCodeDate = __TIMESTAMP__; +extern const std::string EbmlCodeVersion; +extern const std::string EbmlCodeDate; /*! \todo Closer relation between an element and the context it comes from (context is an element attribute ?) diff --git a/src/EbmlVersion.cpp b/src/EbmlVersion.cpp index 2716b96..eae57ce 100644 --- a/src/EbmlVersion.cpp +++ b/src/EbmlVersion.cpp @@ -1,41 +1,44 @@ -/**************************************************************************** -** libebml : parse EBML files, see http://embl.sourceforge.net/ -** -** -** -** Copyright (C) 2002-2010 Steve Lhomme. All rights reserved. -** -** This file is part of libebml. -** -** This library is free software; you can redistribute it and/or -** modify it under the terms of the GNU Lesser General Public -** License as published by the Free Software Foundation; either -** version 2.1 of the License, or (at your option) any later version. -** -** This library 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 -** Lesser General Public License for more details. -** -** You should have received a copy of the GNU Lesser General Public -** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information. -** -** Contact license@matroska.org if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ - -/*! - \file - \version \$Id: EbmlVersion.cpp 639 2004-07-09 20:59:14Z mosu $ - \author Steve Lhomme -*/ - -#include "ebml/EbmlVersion.h" - -START_LIBEBML_NAMESPACE - -END_LIBEBML_NAMESPACE +/**************************************************************************** +** libebml : parse EBML files, see http://embl.sourceforge.net/ +** +** +** +** Copyright (C) 2002-2010 Steve Lhomme. All rights reserved. +** +** This file is part of libebml. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License as published by the Free Software Foundation; either +** version 2.1 of the License, or (at your option) any later version. +** +** This library 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 +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** +** See http://www.matroska.org/license/lgpl/ for LGPL licensing information. +** +** Contact license@matroska.org if any conditions of this licensing are +** not clear to you. +** +**********************************************************************/ + +/*! + \file + \version \$Id: EbmlVersion.cpp 639 2004-07-09 20:59:14Z mosu $ + \author Steve Lhomme +*/ + +#include "ebml/EbmlVersion.h" + +START_LIBEBML_NAMESPACE + +const std::string EbmlCodeVersion = "1.2.2"; +const std::string EbmlCodeDate = __TIMESTAMP__; + +END_LIBEBML_NAMESPACE