patches/vs2012.patch - Issue 27079003: Use the system stdint.h on Windows.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: patches/vs2012.patch

Issue 27079003: Use the system stdint.h on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/icu46/

Patch Set: Created 7 years, 2 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 | Annotate | Revision Log

OLD	NEW
1 Index: source/common/stringpiece.cpp	1 Index: source/common/stringpiece.cpp

2 ===================================================================	2 ===================================================================

3 --- source/common/stringpiece.cpp (revision 158118)	3 --- source/common/stringpiece.cpp (revision 158118)

4 +++ source/common/stringpiece.cpp (working copy)	4 +++ source/common/stringpiece.cpp (working copy)

5 @@ -75,7 +75,7 @@	5 @@ -75,7 +75,7 @@

6 * Visual Studios 9.0.	6 * Visual Studios 9.0.

7 * Cygwin with MSVC 9.0 also complains here about redefinition.	7 * Cygwin with MSVC 9.0 also complains here about redefinition.

8 */	8 */

9 -#if (!defined(_MSC_VER) \|\| (_MSC_VER > 1600)) && !defined(CYGWINMSVC)	9 -#if (!defined(_MSC_VER) \|\| (_MSC_VER > 1600)) && !defined(CYGWINMSVC)

10 +#if (!defined(_MSC_VER) \|\| (_MSC_VER > 1800)) && !defined(CYGWINMSVC)	10 +#if (!defined(_MSC_VER) \|\| (_MSC_VER > 1800)) && !defined(CYGWINMSVC)

11 const int32_t StringPiece::npos;	11 const int32_t StringPiece::npos;

12 #endif	12 #endif

13	13

14 Index: public/common/unicode/pwin32.h	14 Index: source/common/unicode/pwin32.h

15 ===================================================================	15 ===================================================================

16 --- public/common/unicode/pwin32.h (revision 158118)	16 --- source/common/unicode/pwin32.h (revision 158118)

17 +++ public/common/unicode/pwin32.h (working copy)	17 +++ source/common/unicode/pwin32.h (working copy)

18 @@ -26,6 +26,10 @@	18 @@ -26,6 +26,10 @@

19 #define U_WINDOWS	19 #define U_WINDOWS

20 #endif	20 #endif

21	21

22 +#if _MSC_VER >= 1700	22 +#if _MSC_VER >= 1600

23 +#include <stdint.h>	23 +#include <stdint.h>

24 +#endif	24 +#endif

25 +	25 +

26 #if defined(__BORLANDC__)	26 #if defined(__BORLANDC__)

27 #define U_HAVE_PLACEMENT_NEW 0	27 #define U_HAVE_PLACEMENT_NEW 0

28 #define __STDC_CONSTANT_MACROS	28 #define __STDC_CONSTANT_MACROS

29	29

OLD	NEW

« no previous file with comments | « no previous file | source/common/unicode/pwin32.h » ('j') | no next file with comments »