From: Pierre d'Herbemont <pdherbemont@videolan.org>
Date: Wed, 28 May 2008 18:25:41 +0000 (+0200)
Subject: Make sure INT64_C is defined correctly, and that we don't conflict with config.h.
X-Git-Tag: 0.9.0-test0~603
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=94f55c6038a3f727f3de61099167a44dfd9f2cd6;p=vlc

Make sure INT64_C is defined correctly, and that we don't conflict with config.h.
---

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index ffed8fe809..da9e56daef 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -27,11 +27,15 @@
  * Preamble
  *****************************************************************************/
 
+/* For inttypes.h
+ * Note: config.h may include inttypes.h, so make sure we define this option
+ * early enough. */
+#define __STDC_CONSTANT_MACROS 1
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#define __STDC_CONSTANT_MACROS 1
 #include <inttypes.h>
 
 #include <vlc/vlc.h>
diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 9820a2f6e2..23fe44f385 100644
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -26,12 +26,15 @@
  * Preamble
  *****************************************************************************/
 
+/* config.h may include inttypes.h, so make sure we define that option
+ * early enough. */
+#define __STDC_FORMAT_MACROS 1
+#define __STDC_CONSTANT_MACROS 1
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#define __STDC_FORMAT_MACROS 1
-#define __STDC_CONSTANT_MACROS 1
 #include <inttypes.h>
 
 #include <vlc/vlc.h>