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 ffed8fe809a7824148c697fb5b0fefc646c69a4c..da9e56daef0097abf049eee7afcf936550a4f871 100644 (file)
--- 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 9820a2f6e2e8f1d86b93d123aba96c9784edd293..23fe44f385178b4e6485cba18fdcd7dd72c6e4b4 100644 (file)
--- 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>