From 476a3e5b3151a4b626d086e65d53d6f5eea914db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 23 Dec 2007 18:44:08 +0100 Subject: Move os_types.h together with the other includes. --HG-- rename : lib/os_types.h => include/xine/os_types.h --- include/xine/Makefile.am | 2 +- include/xine/os_types.h | 109 +++++++++++++++++++++++++++++++++++++++++++++++ lib/Makefile.am | 1 - lib/os_types.h | 109 ----------------------------------------------- 4 files changed, 110 insertions(+), 111 deletions(-) create mode 100644 include/xine/os_types.h delete mode 100644 lib/os_types.h diff --git a/include/xine/Makefile.am b/include/xine/Makefile.am index 2861460be..8c86f3e2a 100644 --- a/include/xine/Makefile.am +++ b/include/xine/Makefile.am @@ -8,4 +8,4 @@ xineinclude_HEADERS = version.h buffer.h metronom.h configfile.h vo_scale.h \ io_helper.h broadcaster.h info_helper.h refcounter.h alphablend.h \ demux.h input_plugin.h attributes.h compat.h xine_buffer.h \ xineutils.h xmllexer.h xmlparser.h list.h array.h sorted_array.h \ - pool.h ring_buffer.h + pool.h ring_buffer.h os_types.h diff --git a/include/xine/os_types.h b/include/xine/os_types.h new file mode 100644 index 000000000..75ce9b8a5 --- /dev/null +++ b/include/xine/os_types.h @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2004-2006 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA + * + * Platform dependent types needed by public xine.h. + * Types not needed by xine.h are specified in os_internal.h. + * + * Heavily based on os_types.h from OggVorbis (BSD License), + * not tested on all platforms with xine. + */ + +#ifndef XINE_OS_TYPES_H +#define XINE_OS_TYPES_H + +#if defined(_WIN32) && !defined(__GNUC__) + + /* MSVC/Borland */ + typedef __int8 int8_t; + typedef unsigned __int8 uint8_t; + typedef __int16 int16_t; + typedef unsigned __int16 uint16_t; + typedef __int32 int32_t; + typedef unsigned __int32 uint32_t; + typedef __int64 int64_t; + typedef unsigned __int64 uint64_t; + +#elif defined(__MACOS__) + +# include + typedef SInt8 int8_t; + typedef UInt8 uint8_t; + typedef SInt16 int16_t; + typedef UInt16 uint16_t; + typedef SInt32 int32_t; + typedef UInt32 uint32_t; + typedef SInt64 int64_t; + typedef UInt64 uint64_t; + +#elif defined(__MACOSX__) /* MacOS X Framework build */ + +# include + typedef u_int8_t uint8_t; + typedef u_int16_t uint16_t; + typedef u_int32_t uint32_t; + typedef u_int64_t uint64_t; + +#elif defined (__EMX__) + + /* OS/2 GCC */ + typedef signed char int8_t; + typedef unsigned char uint8_t; + typedef short int16_t; + typedef unsigned short uint16_t; + typedef int int32_t; + typedef unsigned int uint32_t; + typedef long long int64_t; + typedef unsigned long long int64_t; + +#elif defined (DJGPP) + + /* DJGPP */ + typedef signed char int8_t; + typedef unsigned char uint8_t; + typedef short int16_t; + typedef unsigned short uint16_t; + typedef int int32_t; + typedef unsigned int uint32_t; + typedef long long int64_t; + typedef unsigned long long uint64_t; + +#elif defined(R5900) + + /* PS2 EE */ + typedef signed char int8_t; + typedef unsigned char uint8_t; + typedef short int16_t; + typedef unsigned short int16_t; + typedef int int32_t; + typedef unsigned uint32_t; + typedef long int64_t; + typedef unsigned long int64_t; + +#else + + /* + * CygWin: _WIN32 & __GNUC__ + * BeOS: __BEOS__ + * Linux, Solaris, Mac and others + */ +# include + +#endif + +#endif /* XINE_OS_TYPES_H */ diff --git a/lib/Makefile.am b/lib/Makefile.am index c6462037e..931c411ac 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -6,7 +6,6 @@ EXTRA_DIST = Makefile.common noinst_LTLIBRARIES = libxineposix.la noinst_HEADERS = os_internal.h -xineinclude_HEADERS = os_types.h libxineposix_la_SOURCES = libxineposix_la_LIBADD = @LTLIBOBJS@ diff --git a/lib/os_types.h b/lib/os_types.h deleted file mode 100644 index 75ce9b8a5..000000000 --- a/lib/os_types.h +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (C) 2004-2006 the xine project - * - * This file is part of xine, a free video player. - * - * xine is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * xine is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * Platform dependent types needed by public xine.h. - * Types not needed by xine.h are specified in os_internal.h. - * - * Heavily based on os_types.h from OggVorbis (BSD License), - * not tested on all platforms with xine. - */ - -#ifndef XINE_OS_TYPES_H -#define XINE_OS_TYPES_H - -#if defined(_WIN32) && !defined(__GNUC__) - - /* MSVC/Borland */ - typedef __int8 int8_t; - typedef unsigned __int8 uint8_t; - typedef __int16 int16_t; - typedef unsigned __int16 uint16_t; - typedef __int32 int32_t; - typedef unsigned __int32 uint32_t; - typedef __int64 int64_t; - typedef unsigned __int64 uint64_t; - -#elif defined(__MACOS__) - -# include - typedef SInt8 int8_t; - typedef UInt8 uint8_t; - typedef SInt16 int16_t; - typedef UInt16 uint16_t; - typedef SInt32 int32_t; - typedef UInt32 uint32_t; - typedef SInt64 int64_t; - typedef UInt64 uint64_t; - -#elif defined(__MACOSX__) /* MacOS X Framework build */ - -# include - typedef u_int8_t uint8_t; - typedef u_int16_t uint16_t; - typedef u_int32_t uint32_t; - typedef u_int64_t uint64_t; - -#elif defined (__EMX__) - - /* OS/2 GCC */ - typedef signed char int8_t; - typedef unsigned char uint8_t; - typedef short int16_t; - typedef unsigned short uint16_t; - typedef int int32_t; - typedef unsigned int uint32_t; - typedef long long int64_t; - typedef unsigned long long int64_t; - -#elif defined (DJGPP) - - /* DJGPP */ - typedef signed char int8_t; - typedef unsigned char uint8_t; - typedef short int16_t; - typedef unsigned short uint16_t; - typedef int int32_t; - typedef unsigned int uint32_t; - typedef long long int64_t; - typedef unsigned long long uint64_t; - -#elif defined(R5900) - - /* PS2 EE */ - typedef signed char int8_t; - typedef unsigned char uint8_t; - typedef short int16_t; - typedef unsigned short int16_t; - typedef int int32_t; - typedef unsigned uint32_t; - typedef long int64_t; - typedef unsigned long int64_t; - -#else - - /* - * CygWin: _WIN32 & __GNUC__ - * BeOS: __BEOS__ - * Linux, Solaris, Mac and others - */ -# include - -#endif - -#endif /* XINE_OS_TYPES_H */ -- cgit v1.2.3