API: rename HAVE_32BITS_PCI_DOMAIN with HWLOC_ prefix

To avoid polluting the public macro namespace.

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin

config/hwloc.m4

@@ -848,7 +848,7 @@ return 0;
     fi
 
     AS_IF([test "x$enable_32bits_pci_domain" = "xyes"], [
-      AC_DEFINE([HAVE_32BITS_PCI_DOMAIN], 1,
+      AC_DEFINE([HWLOC_HAVE_32BITS_PCI_DOMAIN], 1,
         [Define to 1 if --enable-32bits-pci-domain is called.])
     ])
 

hwloc/topology-linux.c

@@ -6486,15 +6486,15 @@ hwloc_linuxfs_pci_look_pcidevices(struct hwloc_backend *backend)
     if (sscanf(dirent->d_name, "%x:%02x:%02x.%01x", &domain, &bus, &dev, &func) != 4)
       continue;
 
-    #ifndef HAVE_32BITS_PCI_DOMAIN
+#ifndef HWLOC_HAVE_32BITS_PCI_DOMAIN
     if (domain > 0xffff) {
       static int warned = 0;
       if (!warned && !hwloc_hide_errors())
 	fprintf(stderr, "Ignoring PCI device with non-16bit domain.\nPass --enable-32bits-pci-domain to configure to support such devices\n(warning: it would break the library ABI, don't enable unless really needed).\n");
       warned = 1;
       continue;
     }
-    #endif
+#endif
 
     /* initialize the config space in case we fail to read it (missing permissions, etc). */
     memset(config_space_cache, 0xff, CONFIG_SPACE_CACHESIZE);

hwloc/topology-pci.c

@@ -200,15 +200,15 @@ hwloc_look_pci(struct hwloc_backend *backend, struct hwloc_disc_status *dstatus)
     dev = pcidev->dev;
     func = pcidev->func;
 
-    #ifndef HAVE_32BITS_PCI_DOMAIN
+#ifndef HWLOC_HAVE_32BITS_PCI_DOMAIN
     if (domain > 0xffff) {
       static int warned = 0;
       if (!warned && !hwloc_hide_errors())
 	fprintf(stderr, "Ignoring PCI device with non-16bit domain.\nPass --enable-32bits-pci-domain to configure to support such devices\n(warning: it would break the library ABI, don't enable unless really needed).\n");
       warned = 1;
       continue;
     }
-    #endif
+#endif
 
     /* initialize the config space in case we fail to read it (missing permissions, etc). */
     memset(config_space_cache, 0xff, CONFIG_SPACE_CACHESIZE);

hwloc/topology-xml.c

@@ -259,7 +259,7 @@ hwloc__xml_import_object_attr(struct hwloc_topology *topology,
 	  fprintf(stderr, "%s: ignoring invalid pci_busid format string %s\n",
 		  state->global->msgprefix, value);
 	*ignore = 1;
-#ifndef HAVE_32BITS_PCI_DOMAIN
+#ifndef HWLOC_HAVE_32BITS_PCI_DOMAIN
       } else if (domain > 0xffff) {
 	static int warned = 0;
 	if (!warned && !hwloc_hide_errors())
@@ -358,7 +358,7 @@ hwloc__xml_import_object_attr(struct hwloc_topology *topology,
 	  fprintf(stderr, "%s: ignoring invalid bridge_pci format string %s\n",
 		  state->global->msgprefix, value);
 	*ignore = 1;
-#ifndef HAVE_32BITS_PCI_DOMAIN
+#ifndef HWLOC_HAVE_32BITS_PCI_DOMAIN
       } else if (domain > 0xffff) {
 	static int warned = 0;
 	if (!warned && !hwloc_hide_errors())

include/hwloc.h

@@ -617,11 +617,11 @@ union hwloc_obj_attr_u {
   } group;
   /** \brief PCI Device specific Object Attributes */
   struct hwloc_pcidev_attr_s {
-    #ifndef HAVE_32BITS_PCI_DOMAIN
+#ifndef HWLOC_HAVE_32BITS_PCI_DOMAIN
     unsigned short domain; /* Only 16bits PCI domains are supported by default */
-    #else
+#else
     unsigned int domain; /* 32bits PCI domain support break the library ABI, hence it's disabled by default */
-    #endif
+#endif
     unsigned char bus, dev, func;
     unsigned short class_id;
     unsigned short vendor_id, device_id, subvendor_id, subdevice_id;
@@ -636,7 +636,7 @@ union hwloc_obj_attr_u {
     hwloc_obj_bridge_type_t upstream_type;
     union {
       struct {
-#ifndef HAVE_32BITS_PCI_DOMAIN
+#ifndef HWLOC_HAVE_32BITS_PCI_DOMAIN
 	unsigned short domain; /* Only 16bits PCI domains are supported by default */
 #else
 	unsigned int domain; /* 32bits PCI domain support break the library ABI, hence it's disabled by default */

include/hwloc/autogen/config.h.in

@@ -218,7 +218,7 @@ typedef uint64_t hwloc_uint64_t;
 #endif /* HWLOC_HAVE_WINDOWS_H */
 
 /* Define to 1 if --enable-32bits-pci-domain is called. */
-#undef HAVE_32BITS_PCI_DOMAIN
+#undef HWLOC_HAVE_32BITS_PCI_DOMAIN
 
 /* Whether we need to re-define all the hwloc public symbols or not */
 #undef HWLOC_SYM_TRANSFORM