Index: ppapi/proxy/interface_list.h |
=================================================================== |
--- ppapi/proxy/interface_list.h (revision 100758) |
+++ ppapi/proxy/interface_list.h (working copy) |
@@ -39,23 +39,23 @@ |
struct InterfaceInfo { |
InterfaceInfo() |
: id(INTERFACE_ID_NONE), |
- interface(NULL) { |
+ iface(NULL) { |
} |
InterfaceInfo(InterfaceID in_id, const void* in_interface) |
: id(in_id), |
- interface(in_interface) { |
+ iface(in_interface) { |
} |
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. |