Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(343)

Side by Side Diff: include/FLAC/ordinals.h

Issue 1961133002: Update FLAC to 1.3.1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/flac.git@master
Patch Set: build config tweaks for Windows Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « include/FLAC/metadata.h ('k') | include/FLAC/stream_decoder.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* libFLAC - Free Lossless Audio Codec library 1 /* libFLAC - Free Lossless Audio Codec library
2 * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson 2 * Copyright (C) 2000-2009 Josh Coalson
3 * Copyright (C) 2011-2014 Xiph.Org Foundation
3 * 4 *
4 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
6 * are met: 7 * are met:
7 * 8 *
8 * - Redistributions of source code must retain the above copyright 9 * - Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
10 * 11 *
11 * - Redistributions in binary form must reproduce the above copyright 12 * - Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
(...skipping 12 matching lines...) Expand all
25 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 26 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
26 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 27 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
27 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 28 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
28 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 29 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
29 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 30 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 31 */
31 32
32 #ifndef FLAC__ORDINALS_H 33 #ifndef FLAC__ORDINALS_H
33 #define FLAC__ORDINALS_H 34 #define FLAC__ORDINALS_H
34 35
35 #if !(defined(_MSC_VER) || defined(__BORLANDC__) || defined(__EMX__)) 36 #if defined(_MSC_VER) && _MSC_VER < 1600
36 #include <inttypes.h>
37 #endif
38 37
39 typedef signed char FLAC__int8; 38 /* Microsoft Visual Studio earlier than the 2010 version did not provide
40 typedef unsigned char FLAC__uint8; 39 * the 1999 ISO C Standard header file <stdint.h>.
40 */
41 41
42 #if defined(_MSC_VER) || defined(__BORLANDC__) 42 typedef __int8 FLAC__int8;
43 typedef unsigned __int8 FLAC__uint8;
44
43 typedef __int16 FLAC__int16; 45 typedef __int16 FLAC__int16;
44 typedef __int32 FLAC__int32; 46 typedef __int32 FLAC__int32;
45 typedef __int64 FLAC__int64; 47 typedef __int64 FLAC__int64;
46 typedef unsigned __int16 FLAC__uint16; 48 typedef unsigned __int16 FLAC__uint16;
47 typedef unsigned __int32 FLAC__uint32; 49 typedef unsigned __int32 FLAC__uint32;
48 typedef unsigned __int64 FLAC__uint64; 50 typedef unsigned __int64 FLAC__uint64;
49 #elif defined(__EMX__) 51
50 typedef short FLAC__int16;
51 typedef long FLAC__int32;
52 typedef long long FLAC__int64;
53 typedef unsigned short FLAC__uint16;
54 typedef unsigned long FLAC__uint32;
55 typedef unsigned long long FLAC__uint64;
56 #else 52 #else
53
54 /* For MSVC 2010 and everything else which provides <stdint.h>. */
55
56 #include <stdint.h>
57
58 typedef int8_t FLAC__int8;
59 typedef uint8_t FLAC__uint8;
60
57 typedef int16_t FLAC__int16; 61 typedef int16_t FLAC__int16;
58 typedef int32_t FLAC__int32; 62 typedef int32_t FLAC__int32;
59 typedef int64_t FLAC__int64; 63 typedef int64_t FLAC__int64;
60 typedef uint16_t FLAC__uint16; 64 typedef uint16_t FLAC__uint16;
61 typedef uint32_t FLAC__uint32; 65 typedef uint32_t FLAC__uint32;
62 typedef uint64_t FLAC__uint64; 66 typedef uint64_t FLAC__uint64;
67
63 #endif 68 #endif
64 69
65 typedef int FLAC__bool; 70 typedef int FLAC__bool;
66 71
67 typedef FLAC__uint8 FLAC__byte; 72 typedef FLAC__uint8 FLAC__byte;
68 73
74
69 #ifdef true 75 #ifdef true
70 #undef true 76 #undef true
71 #endif 77 #endif
72 #ifdef false 78 #ifdef false
73 #undef false 79 #undef false
74 #endif 80 #endif
75 #ifndef __cplusplus 81 #ifndef __cplusplus
76 #define true 1 82 #define true 1
77 #define false 0 83 #define false 0
78 #endif 84 #endif
79 85
80 #endif 86 #endif
OLDNEW
« no previous file with comments | « include/FLAC/metadata.h ('k') | include/FLAC/stream_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698