From 10338df395f2f3096b877665720a89b1c1f3cf39 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Mon, 15 Mar 2010 10:07:35 +0100 Subject: [PATCH] the common/mm_io.h include implies common.h --- lib/avilib-0.6.10/xio.cpp | 7 +++---- src/common/bit_cursor.h | 2 +- src/common/chapters/writer.cpp | 4 +--- src/common/id3.cpp | 2 +- src/common/kax_file.h | 2 +- src/common/mm_multi_file_io.h | 2 +- src/common/output.cpp | 2 +- src/common/random.cpp | 2 +- src/common/random.h | 2 +- src/common/vint.h | 2 +- src/common/wavpack.h | 3 ++- src/common/xml/element_writer.h | 3 +-- src/extract/mkvextract.h | 5 ++--- src/input/r_asf.h | 2 +- src/input/r_corepicture.cpp | 2 +- src/input/r_flac.h | 3 +-- src/input/r_flv.h | 2 +- src/input/r_ogm_flac.h | 2 +- src/input/r_usf.cpp | 2 +- src/merge/cluster_helper.h | 4 +--- 20 files changed, 24 insertions(+), 31 deletions(-) diff --git a/lib/avilib-0.6.10/xio.cpp b/lib/avilib-0.6.10/xio.cpp index 28ede8c3f..3983fd676 100644 --- a/lib/avilib-0.6.10/xio.cpp +++ b/lib/avilib-0.6.10/xio.cpp @@ -21,7 +21,8 @@ * */ -#include "common/os.h" +#include "common/common.h" + #include #include #include @@ -34,7 +35,7 @@ #include "common/mm_io.h" -extern "C" { +#include "xio.h" #define MAX_INSTANCES 4000 @@ -165,5 +166,3 @@ xio_fstat(int fd, // Not implemented for mkvtoolnix. return -1; } - -} diff --git a/src/common/bit_cursor.h b/src/common/bit_cursor.h index c0de5a05d..23b2220f1 100644 --- a/src/common/bit_cursor.h +++ b/src/common/bit_cursor.h @@ -15,7 +15,7 @@ #ifndef __MTX_COMMON_BIT_CURSOR_H #define __MTX_COMMON_BIT_CURSOR_H -#include "common/os.h" +#include "common/common.h" #include "common/mm_io.h" diff --git a/src/common/chapters/writer.cpp b/src/common/chapters/writer.cpp index 1207a1bca..d1e8b582c 100644 --- a/src/common/chapters/writer.cpp +++ b/src/common/chapters/writer.cpp @@ -11,12 +11,10 @@ Written by Moritz Bunkus . */ -#include "common/os.h" +#include "common/common.h" #include -#include - #include #include "common/chapters/chapters.h" diff --git a/src/common/id3.cpp b/src/common/id3.cpp index 54cf0b077..ca49572b7 100644 --- a/src/common/id3.cpp +++ b/src/common/id3.cpp @@ -11,7 +11,7 @@ Written by Moritz Bunkus . */ -#include "common/os.h" +#include "common/common.h" #include "common/mm_io.h" diff --git a/src/common/kax_file.h b/src/common/kax_file.h index 30ac4bde7..d9f8a4e68 100644 --- a/src/common/kax_file.h +++ b/src/common/kax_file.h @@ -14,7 +14,7 @@ #ifndef __MTX_COMMON_KAX_FILE_H #define __MTX_COMMON_KAX_FILE_H -#include "os.h" +#include "common.h" #include #include diff --git a/src/common/mm_multi_file_io.h b/src/common/mm_multi_file_io.h index 53783c20c..8a5e38b2c 100644 --- a/src/common/mm_multi_file_io.h +++ b/src/common/mm_multi_file_io.h @@ -14,7 +14,7 @@ #ifndef __MTX_COMMON_MM_MULTI_FILE_IO_H #define __MTX_COMMON_MM_MULTI_FILE_IO_H -#include "common/os.h" +#include "common/common.h" #include #include diff --git a/src/common/output.cpp b/src/common/output.cpp index 247584a9a..81d60822b 100644 --- a/src/common/output.cpp +++ b/src/common/output.cpp @@ -11,7 +11,7 @@ Written by Moritz Bunkus . */ -#include "common/os.h" +#include "common/common.h" #include "common/ebml.h" #include "common/mm_io.h" diff --git a/src/common/random.cpp b/src/common/random.cpp index e1c455d62..885ed98a1 100644 --- a/src/common/random.cpp +++ b/src/common/random.cpp @@ -11,7 +11,7 @@ Written by Moritz Bunkus . */ -#include "common/os.h" +#include "common/common.h" #if !defined(SYS_WINDOWS) # include diff --git a/src/common/random.h b/src/common/random.h index ac4415e07..5f84f8eb7 100644 --- a/src/common/random.h +++ b/src/common/random.h @@ -14,7 +14,7 @@ #ifndef __MTX_COMMON_RANDOM_H #define __MTX_COMMON_RANDOM_H -#include "common/os.h" +#include "common/common.h" #include "common/mm_io.h" #include "common/smart_pointers.h" diff --git a/src/common/vint.h b/src/common/vint.h index c1a4dce9f..1891adcbb 100644 --- a/src/common/vint.h +++ b/src/common/vint.h @@ -14,7 +14,7 @@ #ifndef __MTX_COMMON_VINT_H #define __MTX_COMMON_VINT_H -#include "common/os.h" +#include "common/common.h" #include diff --git a/src/common/wavpack.h b/src/common/wavpack.h index 13efcb0ca..927bcb043 100644 --- a/src/common/wavpack.h +++ b/src/common/wavpack.h @@ -15,7 +15,8 @@ #ifndef __MTX_COMMON_WAVPACK_COMMON_H #define __MTX_COMMON_WAVPACK_COMMON_H -#include "common/os.h" +#include "common/common.h" + #include "common/mm_io.h" /* All integers are little endian. */ diff --git a/src/common/xml/element_writer.h b/src/common/xml/element_writer.h index 4b435122f..48efca498 100644 --- a/src/common/xml/element_writer.h +++ b/src/common/xml/element_writer.h @@ -14,10 +14,9 @@ #ifndef __MTX_COMMON_XML_ELEMENT_WRITER_H #define __MTX_COMMON_XML_ELEMENT_WRITER_H -#include "common/os.h" +#include "common/common.h" #include -#include #include "common/mm_io.h" #include "common/xml/element_parser.h" diff --git a/src/extract/mkvextract.h b/src/extract/mkvextract.h index 2da61f869..77c1c2835 100644 --- a/src/extract/mkvextract.h +++ b/src/extract/mkvextract.h @@ -13,12 +13,11 @@ #ifndef __MKVEXTRACT_H #define __MKVEXTRACT_H +#include "common/common.h" + #include #include -#include - -#include #include #include diff --git a/src/input/r_asf.h b/src/input/r_asf.h index 501ce2977..29a5c3aa5 100644 --- a/src/input/r_asf.h +++ b/src/input/r_asf.h @@ -14,7 +14,7 @@ #ifndef __R_ASF_H #define __R_ASF_H -#include "common/os.h" +#include "common/common.h" #include "common/mm_io.h" #include "merge/pr_generic.h" diff --git a/src/input/r_corepicture.cpp b/src/input/r_corepicture.cpp index 0bc779ae1..b13aebf71 100644 --- a/src/input/r_corepicture.cpp +++ b/src/input/r_corepicture.cpp @@ -11,7 +11,7 @@ Written by Steve Lhomme . */ -#include "common/os.h" +#include "common/common.h" #include diff --git a/src/input/r_flac.h b/src/input/r_flac.h index 2ef5d4030..7685d04ee 100644 --- a/src/input/r_flac.h +++ b/src/input/r_flac.h @@ -14,13 +14,12 @@ #ifndef __R_FLAC_H #define __R_FLAC_H -#include "common/os.h" +#include "common/common.h" #include "common/mm_io.h" #include "merge/pr_generic.h" #if defined(HAVE_FLAC_FORMAT_H) -#include #include #if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 diff --git a/src/input/r_flv.h b/src/input/r_flv.h index f55d1a005..28d66a560 100644 --- a/src/input/r_flv.h +++ b/src/input/r_flv.h @@ -14,7 +14,7 @@ #ifndef __R_FLV_H #define __R_FLV_H -#include "common/os.h" +#include "common/common.h" #include "common/mm_io.h" #include "merge/pr_generic.h" diff --git a/src/input/r_ogm_flac.h b/src/input/r_ogm_flac.h index e335d7901..2d5199084 100644 --- a/src/input/r_ogm_flac.h +++ b/src/input/r_ogm_flac.h @@ -14,7 +14,7 @@ #ifndef __R_OGM_FLAC_H #define __R_OGM_FLAC_H -#include "common/os.h" +#include "common/common.h" #if defined(HAVE_FLAC_FORMAT_H) diff --git a/src/input/r_usf.cpp b/src/input/r_usf.cpp index 9cfe2d7be..88c1387dc 100644 --- a/src/input/r_usf.cpp +++ b/src/input/r_usf.cpp @@ -11,7 +11,7 @@ Written by Moritz Bunkus . */ -#include "common/os.h" +#include "common/common.h" #include diff --git a/src/merge/cluster_helper.h b/src/merge/cluster_helper.h index dd1e79cdc..0c2743d49 100644 --- a/src/merge/cluster_helper.h +++ b/src/merge/cluster_helper.h @@ -14,9 +14,7 @@ #ifndef __CLUSTER_HELPER_C #define __CLUSTER_HELPER_C -#include "common/os.h" - -#include +#include "common/common.h" #include #include