libebml: fix some compilation warnings in mingw

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libebml@821 a6f86f6d-0131-4f8e-9e7b-e335508773d5
2011-10-18 16:55:49 +00:00
parent f9489f1f80
commit ffeea955a0
6 changed files with 9 additions and 5 deletions
--- a/4
+++ b/4
@@ -1,3 +1,7 @@
+2011-10-xx robux4
+New 1.2.3 version:
+    - compilation warning fixes for mingw
+
 2011-09-23 robux4/mosu
 New 1.2.2 version:
    - fix usage of the DEBUG #define (use LIBEBML_DEBUG instead)
--- a/ebml/EbmlConfig.h
+++ b/ebml/EbmlConfig.h
@@ -111,7 +111,7 @@
 #define EBML_PRETTYLONGINT(c) (c)
 #endif // __GNUC__

-#if __BORLANDC__ >= 0x0581 //Borland C++ Builder 2006 preview
+#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0581 //Borland C++ Builder 2006 preview
   #include <stdlib.h>  //malloc(), free()
   #include <memory.h> //memcpy()
 #endif //__BORLANDC__
--- a/ebml/EbmlCrc32.h
+++ b/ebml/EbmlCrc32.h
@@ -103,7 +103,7 @@ DECLARE_EBML_BINARY(EbmlCrc32)
 template <class T>
 inline unsigned int GetAlignment(T *dummy=NULL) // VC60 workaround
 {
-#if (_MSC_VER >= 1300)
+#if defined(_MSC_VER) && (_MSC_VER >= 1300)
 	return __alignof(T);
 #elif defined(__GNUC__)
 	return __alignof__(T);
--- a/ebml/EbmlVersion.h
+++ b/ebml/EbmlVersion.h
@@ -42,7 +42,7 @@

 START_LIBEBML_NAMESPACE

-#define LIBEBML_VERSION 0x010202
+#define LIBEBML_VERSION 0x010203

 extern const std::string EbmlCodeVersion;
 extern const std::string EbmlCodeDate;
--- a/libebml.proj
+++ b/libebml.proj
@@ -2,7 +2,7 @@

 LIB ebml
 {
-  PROJECT_VERSION 1.2.2
+  PROJECT_VERSION 1.2.3

  INCLUDE .
  EXPINCLUDE .
--- a/src/EbmlVersion.cpp
+++ b/src/EbmlVersion.cpp
@@ -38,7 +38,7 @@

 START_LIBEBML_NAMESPACE

-const std::string EbmlCodeVersion = "1.2.2";
+const std::string EbmlCodeVersion = "1.2.3";
 const std::string EbmlCodeDate    = __TIMESTAMP__;

 END_LIBEBML_NAMESPACE