summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/interface_list.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-12 20:27:28 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-12 20:27:28 +0000
commit7a291939be5079829b0f87d8007f0885cda2533e (patch)
tree0781771d53aa6b0d01cc54aeba58db3e596677f4 /ppapi/proxy/interface_list.h
parent3114db2cefe843ddd19ab6961fbd944b9f9e32ae (diff)
downloadchromium_src-7a291939be5079829b0f87d8007f0885cda2533e.zip
chromium_src-7a291939be5079829b0f87d8007f0885cda2533e.tar.gz
chromium_src-7a291939be5079829b0f87d8007f0885cda2533e.tar.bz2
Fix Windows build by renaming interface to iface.
TEST=it compiles Review URL: http://codereview.chromium.org/7871005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/interface_list.h')
-rw-r--r--ppapi/proxy/interface_list.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/proxy/interface_list.h b/ppapi/proxy/interface_list.h
index 7354af5..bcbd3b8 100644
--- a/ppapi/proxy/interface_list.h
+++ b/ppapi/proxy/interface_list.h
@@ -47,15 +47,15 @@ class InterfaceList {
}
InterfaceID id;
- const void* interface;
+ const void* iface;
};
typedef std::map<std::string, InterfaceInfo> NameToInterfaceInfoMap;
void AddProxy(InterfaceID id, InterfaceProxy::Factory factory);
- void AddPPB(const char* name, InterfaceID id, const void* interface);
- void AddPPP(const char* name, InterfaceID id, const void* interface);
+ void AddPPB(const char* name, InterfaceID id, const void* iface);
+ void AddPPP(const char* name, InterfaceID id, const void* iface);
// Old-style add functions. These should be removed when the rest of the
// proxies are converted over to using the new system.