Changeset 04803bf in mainline for uspace/srv/loader/include

Timestamp:

2011-03-21T22:00:17Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

Location:

uspace/srv/loader/include

Files:

• arch.h (modified) (1 diff)
• elf.h (modified) (1 diff)
• elf_load.h (modified) (3 diffs)

uspace/srv/loader/include/arch.h

@@ -37 +37 @@
 #define LOADER_ARCH_H_
 
-void program_run(void *entry_point, void *pcb);
+extern void program_run(void *entry_point, void *pcb);
 
 #endif

uspace/srv/loader/include/elf.h

@@ -337 +337 @@
 #endif
 
-extern char *elf_error(unsigned int rc);
+extern const char *elf_error(unsigned int rc);
 
 #endif

uspace/srv/loader/include/elf_load.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -56 +56 @@
 
         /** ELF interpreter name or NULL if statically-linked */
-        char *interp;
+        const char *interp;
 
         /** Pointer to the dynamic section */
@@ -82 +82 @@
 } elf_ld_t;
 
-int elf_load_file(char *file_name, size_t so_bias, eld_flags_t flags,
+int elf_load_file(const char *file_name, size_t so_bias, eld_flags_t flags,
     elf_info_t *info);
 void elf_create_pcb(elf_info_t *info, pcb_t *pcb);