>>> On 03.03.16 at 15:14, <andrew.coop...@citrix.com> wrote: > @@ -82,16 +109,19 @@ XEN_ERRNO(EISCONN, 106) /* Transport endpoint > is already connected */ > XEN_ERRNO(ENOTCONN, 107) /* Transport endpoint is not connected */ > XEN_ERRNO(ETIMEDOUT, 110) /* Connection timed out */ > > -#undef XEN_ERRNO > #endif /* XEN_ERRNO */ > - > -#ifndef __XEN_PUBLIC_ERRNO_H__ > -#define __XEN_PUBLIC_ERRNO_H__ > - > /* ` } */ > > + > +/* > + * Clean up from a default include. Close the enum (for C) and remove the > + * default XEN_ERRNO from scope. > + */ > +#ifdef XEN_ERRNO_DEFAULT_INCLUDE > +#undef XEN_ERRNO_DEFAULT_INCLUDE > +#undef XEN_ERRNO > #ifndef __ASSEMBLY__ > }; > #endif > > -#endif /* __XEN_PUBLIC_ERRNO_H__ */ > +#endif /* XEN_ERRNO_DEFAULT_INCLUDE */
So far, upon reaching the end oft the file XEN_ERRNO is undefined, no matter whether it got defined here or prior to inclusion. I think this property should be retained, but moving the #undef to the very end. Please indicate if that's okay with you, as this doesn't really require another version to be sent. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
