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

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@353 a6f86f6d-0131-4f8e-9e7b-e335508773d5

diff --git a/matroska/KaxDefines.h b/matroska/KaxDefines.h
index cad2d735bf505ed515371d0c61602fb2e78d622a..6d0b9262305b04815d997ae0fd65208977e8d166 100644 (file)
--- a/matroska/KaxDefines.h
+++ b/matroska/KaxDefines.h
@@ -36,7 +36,7 @@
 #include "ebml/EbmlVersion.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_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)

diff --git a/matroska/KaxInfoData.h b/matroska/KaxInfoData.h
index 50210dfd16eae51f6a37d2deecfc79ab52ff52e4..9434abf8875c6ff8b7336e235785e5ab8ca3516c 100644 (file)
--- a/matroska/KaxInfoData.h
+++ b/matroska/KaxInfoData.h
@@ -52,7 +52,7 @@ START_LIBMATROSKA_NAMESPACE
 
 DECLARE_MKX_BINARY(KaxSegmentUID)
        public:
-#if defined(HAVE_EBML2)
+#if defined(HAVE_EBML2) || defined(HAS_EBML2)
         KaxSegmentUID(EBML_DEF_CONS EBML_DEF_SEP EBML_EXTRA_PARAM);
 #endif
                virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);}

diff --git a/src/FileKax.cpp b/src/FileKax.cpp
index b7caa6fae33767b01976d55caf7b76acbd14390e..0d8903f9b197082a8d6eab4c3b55ca2d016cb6e0 100644 (file)
--- a/src/FileKax.cpp
+++ b/src/FileKax.cpp
@@ -452,14 +452,14 @@ END_LIBMATROSKA_NAMESPACE
 
 void matroska_init()
 {
-#if defined(HAVE_EBML2)
+#if defined(HAVE_EBML2) || defined(HAS_EBML2)
     ebml_init();
 #endif
 }
 
 void matroska_done()
 {
-#if defined(HAVE_EBML2)
+#if defined(HAVE_EBML2) || defined(HAS_EBML2)
     ebml_done();
 #endif
 }

diff --git a/src/KaxInfoData.cpp b/src/KaxInfoData.cpp
index 5fc5bba6c02d4e679173f04c6922907c6661d23f..0c0e54185b4e38270770ed37deadf63dc482750f 100644 (file)
--- a/src/KaxInfoData.cpp
+++ b/src/KaxInfoData.cpp
@@ -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)
 :EbmlBinary(EBML_DEF_PARAM EBML_DEF_SEP EBML_EXTRA_CALL)
 {

diff --git a/src/KaxTagMulti.cpp b/src/KaxTagMulti.cpp
index 00c7d93c51edae9f207552dba4984a322f1c4c9f..c4a140f12d54d0c3a9536131b5bc43e7747fa776 100644 (file)
--- a/src/KaxTagMulti.cpp
+++ b/src/KaxTagMulti.cpp
@@ -144,7 +144,7 @@ const EbmlSemanticContext & GetKaxTagsGlobal_Context()
     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)
 #else
 #define DEFINE_TAG_MASTER(a,b,c,d,e)   DEFINE_xxx_MASTER(a,b,c,d,e,*GetKaxTagsGlobal_Context)