If this looks ok, I'll backport it in the 1.0 branch. Brice
Le 10/07/2010 11:49, bgog...@osl.iu.edu a écrit : > Author: bgoglin > Date: 2010-07-10 05:49:02 EDT (Sat, 10 Jul 2010) > New Revision: 2300 > URL: https://svn.open-mpi.org/trac/hwloc/changeset/2300 > > Log: > Stop defining HWLOC_BITS_PER_* and HWLOC_SIZEOF_* in public header, > only have them in private headers. > > (should fix https://bugzilla.redhat.com/show_bug.cgi?id=606498#c6) > > > > Text files modified: > trunk/include/hwloc/config.h.in | 18 ------------------ > > trunk/include/private/misc.h | 13 +++++++++++++ > > 2 files changed, 13 insertions(+), 18 deletions(-) > > Modified: trunk/include/hwloc/config.h.in > ============================================================================== > --- trunk/include/hwloc/config.h.in (original) > +++ trunk/include/hwloc/config.h.in 2010-07-10 05:49:02 EDT (Sat, 10 Jul > 2010) > @@ -95,27 +95,9 @@ > /* Defined to 1 if the CPU_SET macro works */ > #undef HWLOC_HAVE_CPU_SET > > -/* The size of `unsigned long', as computed by sizeof */ > -#undef HWLOC_SIZEOF_UNSIGNED_LONG > - > -/* The size of `unsigned int', as computed by sizeof */ > -#undef HWLOC_SIZEOF_UNSIGNED_INT > - > /* Defined to 1 if you have the <stdint.h> header file. */ > #undef HWLOC_HAVE_STDINT_H > > -#define HWLOC_BITS_PER_LONG (HWLOC_SIZEOF_UNSIGNED_LONG * 8) > -#define HWLOC_BITS_PER_INT (HWLOC_SIZEOF_UNSIGNED_INT * 8) > - > - > -#if (HWLOC_BITS_PER_LONG != 32) && (HWLOC_BITS_PER_LONG != 64) > -#error "unknown size for unsigned long." > -#endif > - > -#if (HWLOC_BITS_PER_INT != 16) && (HWLOC_BITS_PER_INT != 32) && > (HWLOC_BITS_PER_INT != 64) > -#error "unknown size for unsigned int." > -#endif > - > #include <unistd.h> > > /* Defined to 1 if you have the `windows.h' header. */ > > Modified: trunk/include/private/misc.h > ============================================================================== > --- trunk/include/private/misc.h (original) > +++ trunk/include/private/misc.h 2010-07-10 05:49:02 EDT (Sat, 10 Jul > 2010) > @@ -26,6 +26,19 @@ > #define HWLOC_BUILD_ASSERT(condition) ((void)sizeof(char[1 - > 2*!(condition)])) > > > + > +#define HWLOC_BITS_PER_LONG (HWLOC_SIZEOF_UNSIGNED_LONG * 8) > +#define HWLOC_BITS_PER_INT (HWLOC_SIZEOF_UNSIGNED_INT * 8) > + > +#if (HWLOC_BITS_PER_LONG != 32) && (HWLOC_BITS_PER_LONG != 64) > +#error "unknown size for unsigned long." > +#endif > + > +#if (HWLOC_BITS_PER_INT != 16) && (HWLOC_BITS_PER_INT != 32) && > (HWLOC_BITS_PER_INT != 64) > +#error "unknown size for unsigned int." > +#endif > + > + > /** > * ffsl helpers. > */ > _______________________________________________ > hwloc-svn mailing list > hwloc-...@open-mpi.org > http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-svn >
