Changeset 1affcdf3 in mainline for uspace/lib/c/include/loader

Timestamp:

2011-06-10T19:33:41Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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/loader

Files:

• loader.h (modified) (1 diff)
• pcb.h (modified) (1 diff)

uspace/lib/c/include/loader/loader.h

@@ -40 +40 @@
 #include <vfs/vfs.h>
 
-/** Abstraction of a loader connection */
-typedef struct {
-        /** ID of the phone connected to the loader. */
-        int phone_id;
-} loader_t;
+/** Forward declararion */
+struct loader;
+typedef struct loader loader_t;
 
 extern int loader_spawn(const char *);

uspace/lib/c/include/loader/pcb.h

@@ -72 +72 @@
         /** Pointer to ELF dynamic section of the program. */
         void *dynamic;
+        /** Pointer to dynamic linker state structure (runtime_env_t). */
+        void *rtld_runtime;
 } pcb_t;