[vlc-commits] dash: include <config.h> in all cpp files

Rémi Denis-Courmont git at videolan.org
Sat Jan 28 15:25:34 CET 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan 28 16:24:43 2012 +0200| [bf4a19392af196daed81a3887d5b2ef088e3cae9] | committer: Rémi Denis-Courmont

dash: include <config.h> in all cpp files

On Win32, time_t can either be long or long long depending on #define's.
This caused linking failures.

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

 modules/stream_filter/dash/http/HTTPConnection.h   |    4 ----
 .../stream_filter/dash/mpd/SegmentInfoCommon.cpp   |    4 ++++
 .../stream_filter/dash/mpd/SegmentInfoDefault.cpp  |    3 +++
 modules/stream_filter/dash/mpd/SegmentTemplate.cpp |    3 +++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/stream_filter/dash/http/HTTPConnection.h b/modules/stream_filter/dash/http/HTTPConnection.h
index 7bb4e25..5a76d65 100644
--- a/modules/stream_filter/dash/http/HTTPConnection.h
+++ b/modules/stream_filter/dash/http/HTTPConnection.h
@@ -25,10 +25,6 @@
 #ifndef HTTPCONNECTION_H_
 #define HTTPCONNECTION_H_
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_stream.h>
diff --git a/modules/stream_filter/dash/mpd/SegmentInfoCommon.cpp b/modules/stream_filter/dash/mpd/SegmentInfoCommon.cpp
index 14fc38d..0ea4de7 100644
--- a/modules/stream_filter/dash/mpd/SegmentInfoCommon.cpp
+++ b/modules/stream_filter/dash/mpd/SegmentInfoCommon.cpp
@@ -22,6 +22,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "SegmentInfoCommon.h"
 
 #include "Segment.h"
diff --git a/modules/stream_filter/dash/mpd/SegmentInfoDefault.cpp b/modules/stream_filter/dash/mpd/SegmentInfoDefault.cpp
index 5158059..f9a3159 100644
--- a/modules/stream_filter/dash/mpd/SegmentInfoDefault.cpp
+++ b/modules/stream_filter/dash/mpd/SegmentInfoDefault.cpp
@@ -20,6 +20,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "SegmentInfoDefault.h"
 
diff --git a/modules/stream_filter/dash/mpd/SegmentTemplate.cpp b/modules/stream_filter/dash/mpd/SegmentTemplate.cpp
index 793145a..507b543 100644
--- a/modules/stream_filter/dash/mpd/SegmentTemplate.cpp
+++ b/modules/stream_filter/dash/mpd/SegmentTemplate.cpp
@@ -20,6 +20,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "SegmentTemplate.h"
 #include "SegmentTimeline.h"



More information about the vlc-commits mailing list