diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-09 10:18:24 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-09 10:18:24 +0000 |
| commit | dcb28f1914bef05f70d1bcadfe98e0c63d6ae205 (patch) | |
| tree | ba01119df8122422b769de903e9ba89bdbecc6ce /libmpdvdkit2/common.h | |
| parent | 388335c9b4fda02da07f298c367b49bd4c3ff29d (diff) | |
| download | mpv-dcb28f1914bef05f70d1bcadfe98e0c63d6ae205.tar.bz2 mpv-dcb28f1914bef05f70d1bcadfe98e0c63d6ae205.tar.xz | |
Replace unconditional #defines by build system trickery.
This reduces our local diff considerably.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16715 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdvdkit2/common.h')
| -rw-r--r-- | libmpdvdkit2/common.h | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/libmpdvdkit2/common.h b/libmpdvdkit2/common.h index 6d292e4590..534b0e514d 100644 --- a/libmpdvdkit2/common.h +++ b/libmpdvdkit2/common.h @@ -3,9 +3,6 @@ * Collection of useful common types and macros definitions ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * - * Modified for use with MPlayer, changes contained in libdvdcss_changes.diff. - * detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ * $Id$ * * Authors: Samuel Hocevar <sam@via.ecp.fr> @@ -30,10 +27,21 @@ /***************************************************************************** * Basic types definitions *****************************************************************************/ -#include <inttypes.h> - -#ifdef __CYGWIN__ -#define SYS_CYGWIN +#if defined( HAVE_STDINT_H ) +# include <stdint.h> +#elif defined( HAVE_INTTYPES_H ) +# include <inttypes.h> +#elif defined( SYS_CYGWIN ) +# include <sys/types.h> + /* Cygwin only defines half of these... */ + typedef u_int8_t uint8_t; + typedef u_int32_t uint32_t; +#else + /* Fallback types (very x86-centric, sorry) */ + typedef unsigned char uint8_t; + typedef signed char int8_t; + typedef unsigned int uint32_t; + typedef signed int int32_t; #endif #if defined( WIN32 ) |