[vlc-devel] commit: Make sure INT64_C is defined correctly, and that we don' t conflict with config.h. (Pierre d'Herbemont )

[git version control]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Wed May 28 20:25:41 2008 +0200| [94f55c6038a3f727f3de61099167a44dfd9f2cd6]

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=94f55c6038a3f727f3de61099167a44dfd9f2cd6
---

 modules/demux/live555.cpp |    6 +++++-
 modules/demux/mkv.cpp     |    7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index ffed8fe..da9e56d 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 9820a2f..23fe44f 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>