Skip to content

V
vlc-2-2
Commit 94f55c60 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

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

parent daf35d71
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 3 deletions
modules/demux/live555.cpp
View file @ 94f55c60
...@@ -27,11 +27,15 @@ ...@@ -27,11 +27,15 @@
* Preamble * 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 #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #endif
#define __STDC_CONSTANT_MACROS 1
#include <inttypes.h> #include <inttypes.h>
#include <vlc/vlc.h> #include <vlc/vlc.h>
......
modules/demux/mkv.cpp
View file @ 94f55c60
...@@ -26,12 +26,15 @@ ...@@ -26,12 +26,15 @@
* Preamble * 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 #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #endif
#define __STDC_FORMAT_MACROS 1
#define __STDC_CONSTANT_MACROS 1
#include <inttypes.h> #include <inttypes.h>
#include <vlc/vlc.h> #include <vlc/vlc.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment