gpu_plugin/np_utils/np_headers.h - Issue 360018: Removed command_buffer dependency on vectormath (indirectly via core/types.h)...

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: gpu_plugin/np_utils/np_headers.h

Issue 360018: Removed command_buffer dependency on vectormath (indirectly via core/types.h)... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/

Patch Set: Created 11 years, 1 month 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

« no previous file with comments | « gpu_plugin/np_utils/np_browser.cc ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2008 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 #ifndef O3D_GPU_PLUGIN_NP_UTILS_NP_HEADERS_H_	5 #ifndef O3D_GPU_PLUGIN_NP_UTILS_NP_HEADERS_H_

6 #define O3D_GPU_PLUGIN_NP_UTILS_NP_HEADERS_H_	6 #define O3D_GPU_PLUGIN_NP_UTILS_NP_HEADERS_H_

7	7

8 // This is a hack to work around the differing definitions of NPString in the	8 // This is a hack to work around the differing definitions of NPString in the

9 // Chrome and O3D NPAPI headers.	9 // Chrome and O3D NPAPI headers.

10 #define utf8characters UTF8Characters	10 #define utf8characters UTF8Characters

11 #define utf8length UTF8Length	11 #define utf8length UTF8Length

12	12

13 #if defined(O3D_IN_CHROME)	13 #if defined(O3D_IN_CHROME)

14 #include "third_party/npapi/bindings/npapi.h"	14 #include "third_party/npapi/bindings/npapi.h"

15 #include "third_party/npapi/bindings/npruntime.h"	15 #include "third_party/npapi/bindings/npruntime.h"

16 #else	16 #else

17 #include "o3d/third_party/npapi/include/npapi.h"	17 #include "o3d/third_party/npapi/include/npapi.h"

18 #include "o3d/third_party/npapi/include/npruntime.h"	18 #include "o3d/third_party/npapi/include/npruntime.h"

19 #endif	19 #endif

20	20

21 // Deliberately not including a directory name because Chromium and O3D put	21 // Deliberately not including a directory name because Chromium and O3D put

22 // these headers in different directories.	22 // these headers in different directories.

23 //#include "npapi.h"

24 //#include "npruntime.h"

25 #undef utf8characters	23 #undef utf8characters

26 #undef utf8length	24 #undef utf8length

27	25

28 #endif // O3D_GPU_PLUGIN_NP_UTILS_NP_HEADERS_H_	26 #endif // O3D_GPU_PLUGIN_NP_UTILS_NP_HEADERS_H_

OLD	NEW