[vlc-devel] [PATCH 2/2] OS/2 needs __STDC_xxx_MACROS even if C++11 mode

[KO Myung-Hun]

---
 include/vlc_fixups.h                  | 3 ++-
 modules/demux/mkv/virtual_segment.cpp | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 37e886d2..65e2307 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -28,7 +28,8 @@
 
 /* C++11 says there's no need to define __STDC_*_MACROS when including
  * inttypes.h and stdint.h. */
-#if defined (__cplusplus) && (!defined(HAVE_CXX11) || defined(__MINGW32__))
+#if defined (__cplusplus) && \
+    (!defined(HAVE_CXX11) || defined(__MINGW32__) || defined(__OS2__))
 # ifndef __STDC_FORMAT_MACROS
 #  define __STDC_FORMAT_MACROS 1
 # endif
diff --git a/modules/demux/mkv/virtual_segment.cpp b/modules/demux/mkv/virtual_segment.cpp
index c7852d6..ab8ef26 100644
--- a/modules/demux/mkv/virtual_segment.cpp
+++ b/modules/demux/mkv/virtual_segment.cpp
@@ -22,10 +22,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-#include <vector>
-
 #include "demux.hpp"
 
+#include <vector>
+
 /* FIXME move this */
 matroska_segment_c * getSegmentbyUID( KaxSegmentUID * p_uid, std::vector<matroska_segment_c*> *segments )
 {
-- 
1.9.5