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

94f55c60 · Pierre d'Herbemont · daf35d71 · 94f55c60 · 94f55c60
Commit 94f55c60 authored May 28, 2008 by Pierre d'Herbemont
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

modules/demux/live555.cpp modules/demux/live555.cpp +5 -1

modules/demux/mkv.cpp modules/demux/mkv.cpp +5 -2

No files found.
--- 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>

--- 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>