Index: ppapi/generators/idl_gen_wrapper.py |
diff --git a/ppapi/generators/idl_gen_wrapper.py b/ppapi/generators/idl_gen_wrapper.py |
index b828562c15413695c46639cf1944ad0261c653ae..148cf88bb1b5667950a20dae83462a20ac39cdab 100644 |
--- a/ppapi/generators/idl_gen_wrapper.py |
+++ b/ppapi/generators/idl_gen_wrapper.py |
@@ -364,9 +364,7 @@ const void *__%(wrapper_prefix)s_PPPGetInterface(const char *name) { |
if iface.needs_wrapping: |
wrap_iface = '(void *) &%s_Wrappers_%s' % (self.wrapper_prefix, |
iface.struct_name) |
- else: |
- wrap_iface = 'NULL /* Still need slot for real_iface */' |
- out.Write("""static struct %s %s = { |
+ out.Write("""static struct %s %s = { |
.iface_macro = %s, |
.wrapped_iface = %s, |
.real_iface = NULL |
@@ -379,10 +377,11 @@ const void *__%(wrapper_prefix)s_PPPGetInterface(const char *name) { |
ppb_wrapper_infos = [] |
ppp_wrapper_infos = [] |
for iface in iface_releases: |
- appender = PPKind.ChoosePPFunc(iface, |
- ppb_wrapper_infos.append, |
- ppp_wrapper_infos.append) |
- appender(' &%s' % self.GetWrapperInfoName(iface)) |
+ if iface.needs_wrapping: |
+ appender = PPKind.ChoosePPFunc(iface, |
+ ppb_wrapper_infos.append, |
+ ppp_wrapper_infos.append) |
+ appender(' &%s' % self.GetWrapperInfoName(iface)) |
ppb_wrapper_infos.append(' NULL') |
ppp_wrapper_infos.append(' NULL') |
out.Write( |
@@ -399,8 +398,10 @@ const void *__%(wrapper_prefix)s_PPPGetInterface(const char *name) { |
""" |
out.Write('/* BEGIN Declarations for all Wrapper Infos */\n\n') |
for iface in iface_releases: |
- out.Write('static struct %s %s;\n' % |
- (self.GetWrapperMetadataName(), self.GetWrapperInfoName(iface))) |
+ if iface.needs_wrapping: |
+ out.Write('static struct %s %s;\n' % |
+ (self.GetWrapperMetadataName(), |
+ self.GetWrapperInfoName(iface))) |
out.Write('/* END Declarations for all Wrapper Infos. */\n\n') |