native_client_sdk/src/libraries/nacl_io/real_pepper_interface.h - Issue 13998024: [NaCl SDK] nacl_io: fix warning of macro redefinition on Windows.

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

Unified Diff: native_client_sdk/src/libraries/nacl_io/real_pepper_interface.h

Issue 13998024: [NaCl SDK] nacl_io: fix warning of macro redefinition on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « native_client_sdk/src/libraries/nacl_io/pepper_interface.h ('k') | native_client_sdk/src/libraries/nacl_io_test/pepper_interface_mock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: native_client_sdk/src/libraries/nacl_io/real_pepper_interface.h

diff --git a/native_client_sdk/src/libraries/nacl_io/real_pepper_interface.h b/native_client_sdk/src/libraries/nacl_io/real_pepper_interface.h

index 09346cee7bd050ba14fa18b8730a00f00c05763a..412f1f255b43735e8d1b81aa376f0af0b65ac3b4 100644

--- a/native_client_sdk/src/libraries/nacl_io/real_pepper_interface.h

+++ b/native_client_sdk/src/libraries/nacl_io/real_pepper_interface.h

@@ -11,12 +11,12 @@

#include "pepper_interface.h"

// Forward declare interface classes.

+#include "nacl_io/pepper/undef_macros.h"

#include "nacl_io/pepper/define_empty_macros.h"

#undef BEGIN_INTERFACE

#define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \

class Real##BaseClass;

#include "nacl_io/pepper/all_interfaces.h"

-#include "nacl_io/pepper/undef_macros.h"

class RealPepperInterface : public PepperInterface {

public:

@@ -28,12 +28,12 @@ class RealPepperInterface : public PepperInterface {

virtual void ReleaseResource(PP_Resource);

// Interface getters.

+#include "nacl_io/pepper/undef_macros.h"

#include "nacl_io/pepper/define_empty_macros.h"

#undef BEGIN_INTERFACE

#define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \

virtual BaseClass* Get##BaseClass();

#include "nacl_io/pepper/all_interfaces.h"

-#include "nacl_io/pepper/undef_macros.h"

int32_t InitializeMessageLoop();

@@ -43,12 +43,12 @@ class RealPepperInterface : public PepperInterface {

const PPB_MessageLoop* message_loop_interface_;

// Interface pointers.

+#include "nacl_io/pepper/undef_macros.h"

#include "nacl_io/pepper/define_empty_macros.h"

#undef BEGIN_INTERFACE

#define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \

Real##BaseClass* BaseClass##interface_;

#include "nacl_io/pepper/all_interfaces.h"

-#include "nacl_io/pepper/undef_macros.h"

};

#endif // LIBRARIES_NACL_IO_REAL_PEPPER_INTERFACE_H_