third_party/libjingle/overrides/talk/base/basictypes.h - Issue 9174012: Roll libjingle to r108.

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: third_party/libjingle/overrides/talk/base/basictypes.h

Issue 9174012: Roll libjingle to r108. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: '' Created 8 years, 11 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 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 // This file overrides the inclusion of talk/base/basictypes.h to remove	5 // This file overrides the inclusion of talk/base/basictypes.h to remove

6 // collisions with Chromium's base/basictypes.h. We then add back a few	6 // collisions with Chromium's base/basictypes.h. We then add back a few

7 // items that Chromium's version doesn't provide, but libjingle expects.	7 // items that Chromium's version doesn't provide, but libjingle expects.

8	8

9 #ifndef OVERRIDES_TALK_BASE_BASICTYPES_H__	9 #ifndef OVERRIDES_TALK_BASE_BASICTYPES_H__

10 #define OVERRIDES_TALK_BASE_BASICTYPES_H__	10 #define OVERRIDES_TALK_BASE_BASICTYPES_H__

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53 #ifdef WIN32	53 #ifdef WIN32

54 #define alignof(t) __alignof(t)	54 #define alignof(t) __alignof(t)

55 #else // !WIN32	55 #else // !WIN32

56 #define alignof(t) __alignof__(t)	56 #define alignof(t) __alignof__(t)

57 #endif // !WIN32	57 #endif // !WIN32

58 #define IS_ALIGNED(p, a) (0==(reinterpret_cast<uintptr_t>(p) & ((a)-1)))	58 #define IS_ALIGNED(p, a) (0==(reinterpret_cast<uintptr_t>(p) & ((a)-1)))

59 #define ALIGNP(p, t) \	59 #define ALIGNP(p, t) \

60 (reinterpret_cast<uint8*>(((reinterpret_cast<uintptr_t>(p) + \	60 (reinterpret_cast<uint8*>(((reinterpret_cast<uintptr_t>(p) + \

61 ((t)-1)) & ~((t)-1))))	61 ((t)-1)) & ~((t)-1))))

62	62

	63 // LIBJINGLE_DEFINE_STATIC_LOCAL() is a libjingle's copy

	64 // of CR_DEFINE_STATIC_LOCAL().

	65 #define LIBJINGLE_DEFINE_STATIC_LOCAL(type, name, arguments) \

	66 CR_DEFINE_STATIC_LOCAL(type, name, arguments)

	67

63 #endif // OVERRIDES_TALK_BASE_BASICTYPES_H__	68 #endif // OVERRIDES_TALK_BASE_BASICTYPES_H__

OLD	NEW

« no previous file with comments | « third_party/libjingle/libjingle.gyp ('k') | third_party/libjingle/overrides/talk/session/phone/webrtcvideoengine.cc » ('j') | no next file with comments »