Changeset 056d6821 in mainline for uspace/srv/loader/main.c

Timestamp:

2011-07-26T21:17:29Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

051e6ac, 0837ab4

Parents:

2f02ee25 (diff), 75aa59a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/loader/main.c (modified) (2 diffs)

uspace/srv/loader/main.c

@@ -59 +59 @@
 #include <str.h>
 #include <as.h>
-#include <elf.h>
-#include <elf_load.h>
+#include <elf/elf.h>
+#include <elf/elf_load.h>
 
 #ifdef CONFIG_RTLD
@@ -348 +348 @@
 
         /* Initialize list of loaded modules */
-        list_initialize(&runtime_env->modules_head);
-        list_append(&prog_mod.modules_link, &runtime_env->modules_head);
+        list_initialize(&runtime_env->modules);
+        list_append(&prog_mod.modules_link, &runtime_env->modules);
 
         /* Pointer to program module. Used as root of the module graph. */