2.5-18.1

[jlayton/glibc.git] / elf / loadtest.c

diff --git a/elf/loadtest.c b/elf/loadtest.c
index 6b8f4bb7d084d41c77d2710141d6345bf01b070b..727469b49679777f19f2f5cdb3fd41b2422e847b 100644 (file)
--- a/elf/loadtest.c
+++ b/elf/loadtest.c
@@ -70,11 +70,13 @@ static const struct
 
 #include <include/link.h>
 
+#define MAPS ((struct link_map *) _r_debug.r_map)
+
 #define OUT \
-  for (map = _r_debug.r_map; map != NULL; map = map->l_next)                 \
+  for (map = MAPS; map != NULL; map = map->l_next)                   \
     if (map->l_type == lt_loaded)                                            \
-      printf ("name = \"%s\", opencount = %d\n",                             \
-             map->l_name, (int) map->l_opencount);                           \
+      printf ("name = \"%s\", direct_opencount = %d\n",                              \
+             map->l_name, (int) map->l_direct_opencount);                    \
   fflush (stdout)
 
 
@@ -147,7 +149,7 @@ main (int argc, char *argv[])
            {
              /* In this case none of the objects above should be
                 present.  */
-             for (map = _r_debug.r_map; map != NULL; map = map->l_next)
+             for (map = MAPS; map != NULL; map = map->l_next)
                if (map->l_type == lt_loaded
                    && (strstr (map->l_name, testobjs[0].name) != NULL
                        || strstr (map->l_name, testobjs[1].name) != NULL
@@ -180,11 +182,11 @@ main (int argc, char *argv[])
       }
 
   /* Check whether all files are unloaded.  */
-  for (map = _r_debug.r_map; map != NULL; map = map->l_next)
+  for (map = MAPS; map != NULL; map = map->l_next)
     if (map->l_type == lt_loaded)
       {
-       printf ("name = \"%s\", opencount = %d\n",
-               map->l_name, (int) map->l_opencount);
+       printf ("name = \"%s\", direct_opencount = %d\n",
+               map->l_name, (int) map->l_direct_opencount);
        result = 1;
       }