(nl): Rename to name_list to avoid ncurses.h clash (bug#86).

(getloadavg): Callers changed.

diff --git a/src/getloadavg.c b/src/getloadavg.c
index 32d0f41a4a93eb34a5efb765aa617646cc9ab69b..a174fc07a01b15f4ecf1d0232f8d01b17db0aff2 100644 (file)
--- a/src/getloadavg.c
+++ b/src/getloadavg.c
@@ -490,7 +490,7 @@ static int getloadavg_initialized;
 static long offset;
 
 #  if !defined(VMS) && !defined(sgi) && !defined(__linux__)
-static struct nlist nl[2];
+static struct nlist name_list[2];
 #  endif /* Not VMS or sgi */
 
 #  ifdef SUNOS_5
@@ -880,32 +880,32 @@ getloadavg (loadavg, nelem)
     {
 #  ifndef sgi
 #   ifndef NLIST_STRUCT
-      strcpy (nl[0].n_name, LDAV_SYMBOL);
-      strcpy (nl[1].n_name, "");
+      strcpy (name_list[0].n_name, LDAV_SYMBOL);
+      strcpy (name_list[1].n_name, "");
 #   else /* NLIST_STRUCT */
 #    ifdef HAVE_STRUCT_NLIST_N_UN_N_NAME
-      nl[0].n_un.n_name = LDAV_SYMBOL;
-      nl[1].n_un.n_name = 0;
+      name_list[0].n_un.n_name = LDAV_SYMBOL;
+      name_list[1].n_un.n_name = 0;
 #    else /* not HAVE_STRUCT_NLIST_N_UN_N_NAME */
-      nl[0].n_name = LDAV_SYMBOL;
-      nl[1].n_name = 0;
+      name_list[0].n_name = LDAV_SYMBOL;
+      name_list[1].n_name = 0;
 #    endif /* not HAVE_STRUCT_NLIST_N_UN_N_NAME */
 #   endif /* NLIST_STRUCT */
 
 #   ifndef SUNOS_5
       if (
 #    if !(defined (_AIX) && !defined (ps2))
-         nlist (KERNEL_FILE, nl)
+         nlist (KERNEL_FILE, name_list)
 #    else  /* _AIX */
-         knlist (nl, 1, sizeof (nl[0]))
+         knlist (name_list, 1, sizeof (name_list[0]))
 #    endif
          >= 0)
-         /* Omit "&& nl[0].n_type != 0 " -- it breaks on Sun386i.  */
+         /* Omit "&& name_list[0].n_type != 0 " -- it breaks on Sun386i.  */
          {
 #    ifdef FIXUP_KERNEL_SYMBOL_ADDR
-           FIXUP_KERNEL_SYMBOL_ADDR (nl);
+           FIXUP_KERNEL_SYMBOL_ADDR (name_list);
 #    endif
-           offset = nl[0].n_value;
+           offset = name_list[0].n_value;
          }
 #   endif /* !SUNOS_5 */
 #  else  /* sgi */
@@ -941,8 +941,8 @@ getloadavg (loadavg, nelem)
       if (kd != 0)
        {
          /* nlist the currently running kernel.  */
-         kvm_nlist (kd, nl);
-         offset = nl[0].n_value;
+         kvm_nlist (kd, name_list);
+         offset = name_list[0].n_value;
          getloadavg_initialized = 1;
        }
 #  endif /* SUNOS_5 */