generic-library/matroska
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libmatroska: HAVE_EBML2 comes from the config.h and HAS_EBML2 comes from the makefile

Browse Source 
git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@353 a6f86f6d-0131-4f8e-9e7b-e335508773d5
This commit is contained in:
Steve Lhomme 2010-06-27 05:24:02 +00:00
parent 9db1423dc0
commit 429911394f
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matroska/KaxDefines.h
View File

@ -36,7 +36,7 @@
#include "ebml/EbmlVersion.h" #include "ebml/EbmlVersion.h"
#include "ebml/EbmlElement.h" #include "ebml/EbmlElement.h"
#if defined(HAVE_EBML2) #if defined(HAVE_EBML2) || defined(HAS_EBML2)
#define DEFINE_MKX_CONTEXT(a) DEFINE_xxx_CONTEXT(a,EBML_SemanticGlobal) #define DEFINE_MKX_CONTEXT(a) DEFINE_xxx_CONTEXT(a,EBML_SemanticGlobal)
#define DEFINE_MKX_MASTER_CONS(a,b,c,d,e) DEFINE_xxx_MASTER_CONS(a,b,d,e,EBML_SemanticGlobal) #define DEFINE_MKX_MASTER_CONS(a,b,c,d,e) DEFINE_xxx_MASTER_CONS(a,b,d,e,EBML_SemanticGlobal)
#define DEFINE_MKX_MASTER(a,b,c,d,e) DEFINE_xxx_MASTER(a,b,d,e,EBML_SemanticGlobal) #define DEFINE_MKX_MASTER(a,b,c,d,e) DEFINE_xxx_MASTER(a,b,d,e,EBML_SemanticGlobal)

2
matroska/KaxInfoData.h
View File

@ -52,7 +52,7 @@ START_LIBMATROSKA_NAMESPACE
DECLARE_MKX_BINARY(KaxSegmentUID) DECLARE_MKX_BINARY(KaxSegmentUID)
public: public:
#if defined(HAVE_EBML2) #if defined(HAVE_EBML2) || defined(HAS_EBML2)
KaxSegmentUID(EBML_DEF_CONS EBML_DEF_SEP EBML_EXTRA_PARAM); KaxSegmentUID(EBML_DEF_CONS EBML_DEF_SEP EBML_EXTRA_PARAM);
#endif #endif
virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);} virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);}

4
src/FileKax.cpp
View File

@ -452,14 +452,14 @@ END_LIBMATROSKA_NAMESPACE
void matroska_init() void matroska_init()
{ {
#if defined(HAVE_EBML2) #if defined(HAVE_EBML2) || defined(HAS_EBML2)
ebml_init(); ebml_init();
#endif #endif
} }
void matroska_done() void matroska_done()
{ {
#if defined(HAVE_EBML2) #if defined(HAVE_EBML2) || defined(HAS_EBML2)
ebml_done(); ebml_done();
#endif #endif
} }

2
src/KaxInfoData.cpp
View File

@ -71,7 +71,7 @@ KaxNextUID::KaxNextUID(EBML_EXTRA_DEF)
{ {
} }
#if defined(HAVE_EBML2) #if defined(HAVE_EBML2) || defined(HAS_EBML2)
KaxSegmentUID::KaxSegmentUID(EBML_DEF_CONS EBML_DEF_SEP EBML_EXTRA_DEF) KaxSegmentUID::KaxSegmentUID(EBML_DEF_CONS EBML_DEF_SEP EBML_EXTRA_DEF)
:EbmlBinary(EBML_DEF_PARAM EBML_DEF_SEP EBML_EXTRA_CALL) :EbmlBinary(EBML_DEF_PARAM EBML_DEF_SEP EBML_EXTRA_CALL)
{ {

2
src/KaxTagMulti.cpp
View File

@ -144,7 +144,7 @@ const EbmlSemanticContext & GetKaxTagsGlobal_Context()
return EBML_CLASS_SEMCONTEXT(KaxTagMultiGlobal); return EBML_CLASS_SEMCONTEXT(KaxTagMultiGlobal);
} }
#if defined(HAVE_EBML2) #if defined(HAVE_EBML2) || defined(HAS_EBML2)
#define DEFINE_TAG_MASTER(a,b,c,d,e) DEFINE_xxx_MASTER(a,b,d,e,EBML_SemanticKaxTagMultiGlobal) #define DEFINE_TAG_MASTER(a,b,c,d,e) DEFINE_xxx_MASTER(a,b,d,e,EBML_SemanticKaxTagMultiGlobal)
#else #else
#define DEFINE_TAG_MASTER(a,b,c,d,e) DEFINE_xxx_MASTER(a,b,c,d,e,*GetKaxTagsGlobal_Context) #define DEFINE_TAG_MASTER(a,b,c,d,e) DEFINE_xxx_MASTER(a,b,c,d,e,*GetKaxTagsGlobal_Context)