Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-13 13:41:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rearrange the order of includes to make room for libebml2(Core-C) and precompiled headers

Browse Source
This commit is contained in:
Steve Lhomme 2010-03-09 17:42:01 +01:00 committed by Moritz Bunkus
parent 099fa41bc7
commit fa13fdc3a5
2 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/common.h
View File

@ -14,6 +14,11 @@
#ifndef __MTX_COMMON_H
#define __MTX_COMMON_H
#include <boost/foreach.hpp>
#include <boost/format.hpp>
#include <boost/regex.hpp>
#include <string>
#include "common/os.h"
// Compilation with mingw gcc fails with Boost's format library if
@ -22,11 +27,6 @@
#include <ebml/EbmlElement.h>
#include <ebml/EbmlMaster.h>
#undef min
#include <boost/foreach.hpp>
#include <boost/format.hpp>
#include <string>
/* i18n stuff */
#if defined(HAVE_LIBINTL_H)

43
src/common/os.h
View File

@ -18,16 +18,18 @@
// For PRId64 and PRIu64:
#define __STDC_FORMAT_MACROS
#if defined(HAVE_SYS_TYPES_H)
# include <sys/types.h>
#endif // HAVE_SYS_TYPES_H
#if defined(HAVE_STDINT_H)
# include <stdint.h>
#endif // HAVE_STDINT_H
#if defined(HAVE_INTTYPES_H)
# include <inttypes.h>
#endif // HAVE_INTTYPES_H
#if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
# define SYS_WINDOWS
# if defined __MINGW32__
# define COMP_MINGW
# elif defined __CYGWIN__
# define COMP_CYGWIN
# else
# define COMP_MSC
# define NOMINMAX
# endif
#elif defined(__APPLE__)
# define SYS_APPLE
#else
@ -42,10 +44,20 @@
# endif
#endif
#if defined(SYS_WINDOWS)
# if defined __MINGW32__
# define COMP_MINGW
# elif defined __CYGWIN__
# define COMP_CYGWIN
# else
# define COMP_MSC
# define NOMINMAX
# endif
#endif
#if defined(COMP_MSC)
# define strncasecmp _strnicmp
# define strcasecmp _stricmp
# define nice(a)
typedef __int64 int64_t;
typedef __int32 int32_t;
typedef __int16 int16_t;
@ -54,24 +66,15 @@ typedef unsigned __int64 uint64_t;
typedef unsigned __int32 uint32_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int8 uint8_t;
# define nice(a)
#include <io.h>
typedef _fsize_t ssize_t;
#define PACKED_STRUCTURE
#else
#else // COMP_MSC
#define PACKED_STRUCTURE __attribute__((__packed__))
#endif // COMP_MSC
#if defined(HAVE_SYS_TYPES_H)
# include <sys/types.h>
#endif // HAVE_SYS_TYPES_H
#if defined(HAVE_STDINT_H)
# include <stdint.h>
#endif // HAVE_STDINT_H
#if defined(HAVE_INTTYPES_H)
# include <inttypes.h>
#endif // HAVE_INTTYPES_H
#if defined(COMP_MINGW) || defined(COMP_MSC)
// For DLL stuff...