Merge "mkvparser: Fix include order."

2015-08-28 21:54:04 +00:00
parent a57d6602b4 93b24c4195
commit 49ae6f0dd9
2 changed files with 5 additions and 4 deletions
--- a/mkvparser.cpp
+++ b/mkvparser.cpp
@@ -7,11 +7,12 @@
 // be found in the AUTHORS file in the root of the source tree.

 #include "mkvparser.hpp"
+
 #include <cassert>
-#include <cstring>
-#include <new>
 #include <climits>
 #include <cmath>
+#include <cstring>
+#include <new>

 #ifdef _MSC_VER
 // Disable MSVC warnings that suggest making code non-portable.
--- a/mkvparser.hpp
+++ b/mkvparser.hpp
@@ -9,9 +9,9 @@
 #ifndef MKVPARSER_HPP
 #define MKVPARSER_HPP

-#include <cstdlib>
-#include <cstdio>
 #include <cstddef>
+#include <cstdio>
+#include <cstdlib>

 namespace mkvparser {