diff options
author | Gloria Wang <gwang@google.com> | 2010-02-05 18:52:38 -0800 |
---|---|---|
committer | Gloria Wang <gwang@google.com> | 2010-02-05 18:52:38 -0800 |
commit | aedba5ff4862683d190b50e997596bf83d384684 (patch) | |
tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /Tremolo/os_types.h | |
parent | 0f6f2525f7b19c7de18bafe464b5ced1c714430a (diff) | |
download | external_tremolo-aedba5ff4862683d190b50e997596bf83d384684.zip external_tremolo-aedba5ff4862683d190b50e997596bf83d384684.tar.gz external_tremolo-aedba5ff4862683d190b50e997596bf83d384684.tar.bz2 |
Revert "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)"
This reverts commit 0f6f2525f7b19c7de18bafe464b5ced1c714430a.
Diffstat (limited to 'Tremolo/os_types.h')
-rw-r--r-- | Tremolo/os_types.h | 104 |
1 files changed, 0 insertions, 104 deletions
diff --git a/Tremolo/os_types.h b/Tremolo/os_types.h deleted file mode 100644 index 1549b80..0000000 --- a/Tremolo/os_types.h +++ /dev/null @@ -1,104 +0,0 @@ -/******************************************************************** - * * - * THIS FILE IS PART OF THE Theorarm SOFTWARE CODEC SOURCE CODE. * - * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * - * GOVERNED BY A SOURCE LICENSE INCLUDED WITH THIS SOURCE * - * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * - * * - * THE Theora/Tremor SOURCE CODE IS COPYRIGHT (C) 2002-2009 * - * by the Xiph.Org Foundation and contributors http://www.xiph.org/ * - * Modifications/Additions Copyright (C) 2009 Robin Watts for * - * Pinknoise Productions Ltd. * - * * - ******************************************************************** - - function: #ifdef jail to whip a few platforms into the UNIX ideal. - - ********************************************************************/ -#ifndef _OS_TYPES_H -#define _OS_TYPES_H - -#ifdef _LOW_ACCURACY_ -# define X(n) (((((n)>>22)+1)>>1) - ((((n)>>22)+1)>>9)) -# define LOOKUP_T const unsigned char -#else -# define X(n) (n) -# define LOOKUP_T const ogg_int32_t -#endif - -/* make it easy on the folks that want to compile the libs with a - different malloc than stdlib */ -#define _ogg_malloc malloc -#define _ogg_calloc calloc -#define _ogg_realloc realloc -#define _ogg_free free - -#if defined (_WIN32_WCE) - - typedef unsigned short ogg_uint16_t; - typedef short ogg_int16_t; - typedef int ogg_int32_t; - typedef unsigned int ogg_uint32_t; - typedef __int64 ogg_int64_t; - - #define inline - -#elif defined(_WIN32) - -# ifndef __GNUC__ - /* MSVC/Borland */ - typedef __int64 ogg_int64_t; - typedef __int32 ogg_int32_t; - typedef unsigned __int32 ogg_uint32_t; - typedef __int16 ogg_int16_t; - typedef unsigned __int16 ogg_uint16_t; -# else - /* Cygwin */ - #include <_G_config.h> - typedef _G_int64_t ogg_int64_t; - typedef _G_int32_t ogg_int32_t; - typedef _G_uint32_t ogg_uint32_t; - typedef _G_int16_t ogg_int16_t; - typedef _G_uint16_t ogg_uint16_t; -# endif - -#elif defined(__MACOS__) - -# include <sys/types.h> - typedef SInt16 ogg_int16_t; - typedef UInt16 ogg_uint16_t; - typedef SInt32 ogg_int32_t; - typedef UInt32 ogg_uint32_t; - typedef SInt64 ogg_int64_t; - -#elif defined(__MACOSX__) /* MacOS X Framework build */ - -# include <sys/types.h> - typedef int16_t ogg_int16_t; - typedef u_int16_t ogg_uint16_t; - typedef int32_t ogg_int32_t; - typedef u_int32_t ogg_uint32_t; - typedef int64_t ogg_int64_t; - -#elif defined(__BEOS__) - - /* Be */ -# include <inttypes.h> - -#elif defined (__EMX__) - - /* OS/2 GCC */ - typedef short ogg_int16_t; - typedef unsigned short ogg_uint16_t; - typedef int ogg_int32_t; - typedef unsigned int ogg_uint32_t; - typedef long long ogg_int64_t; - -#else - -# include <sys/types.h> -# include "config_types.h" - -#endif - -#endif /* _OS_TYPES_H */ |