A pox on Linux and the convoluted configure tests that it makes me

do.  Really fix the MCA info params this time -- ensure to not use
#define's that may be #undef'ed.

This commit was SVN r8235.

opal/mca/paffinity/linux/paffinity_linux_component.c

@@ -92,14 +92,22 @@ static int linux_open(void)
     mca_base_param_reg_int(&mca_paffinity_linux_component.paffinityc_version,
                            "have_cpu_set_t",
                            "Whether this component was compiled on a system with the type cpu_set_t or not (1 = yes, 0 = no)",
-                           false, true, HAVE_cpu_set_t, NULL);
+                           false, true,
+#ifdef HAVE_cpu_set_t
+                           HAVE_cpu_set_t,
+#else
+                           0,
+#endif
+                           NULL);
     mca_base_param_reg_int(&mca_paffinity_linux_component.paffinityc_version,
                            "CPU_ZERO_ok",
-                           "Whether this component was compiled on a system where CPU_ZERO() is functional or broken (1 = functional, 0 = broken)",
+                           "Whether this component was compiled on a system where CPU_ZERO() is functional or broken (1 = functional, 0 = broken/not available)",
                            false, true, 
 #ifdef HAVE_CPU_ZERO
                            HAVE_CPU_ZERO,
 #else
+                           /* If we don't have cpu_set_t, then the
+                              macro CPU_ZERO does not exist */
                            0,
 #endif
                            NULL);
@@ -107,7 +115,18 @@ static int linux_open(void)
                            "sched_setaffinity_num_params",
                            "The number of parameters that sched_set_affinity() takes on the machine where this component was compiled",
                            false, true, 
-                           OPAL_PAFFINITY_LINUX_SCHED_SETAFF_NUM_PARAMS, NULL);
+#ifdef OPAL_PAFFINITY_LINUX_SCHED_SETAFF_NUM_PARAMS
+                           OPAL_PAFFINITY_LINUX_SCHED_SETAFF_NUM_PARAMS,
+#else
+                           /* If we do not have cpu_set_t, we don't
+                              check for the number of params (and
+                              therefore OPAL_..._SETAFF_NUM_PARAMS is
+                              undefined), because the only variant
+                              that does not have the type cpu_set_t
+                              has 3 params for sched_set_affinity() */
+                           3,
+#endif
+                           NULL);
 
     return OPAL_SUCCESS;
 }