Changeset 3fb0fec in mainline for uspace/lib/c/include/rtld

Timestamp:

2011-07-26T18:29:44Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7eb0fed8

Parents:

efcebe1 (diff), aa865ee (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.

Location:

uspace/lib/c/include/rtld

Files:

• elf_dyn.h (modified) (1 diff)
• rtld.h (modified) (1 diff)
• symbol.h (modified) (1 diff)

uspace/lib/c/include/rtld/elf_dyn.h

@@ -39 +39 @@
 #include <sys/types.h>
 
-#include <elf.h>
+#include <elf/elf.h>
 #include <libarch/rtld/elf_dyn.h>
 

uspace/lib/c/include/rtld/rtld.h

@@ -49 +49 @@
 
         /** List of all loaded modules including rtld and the program */
-        link_t modules_head;
+        list_t modules;
 
         /** Temporary hack to place each module at different address. */

uspace/lib/c/include/rtld/symbol.h

@@ -36 +36 @@
 #define LIBC_RTLD_SYMBOL_H_
 
+#include <elf/elf.h>
 #include <rtld/rtld.h>
-#include <elf.h>
 
 elf_symbol_t *symbol_bfs_find(const char *name, module_t *start, module_t **mod);