Changeset 925a21e in mainline for uspace/lib/c/include/elf/elf_load.h

Timestamp:

2011-09-24T14:20:29Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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/lib/c/include/elf/elf_load.h (modified) (2 diffs)

uspace/lib/c/include/elf/elf_load.h

@@ -38 +38 @@
 #define ELF_LOAD_H_
 
-#include <arch/elf.h>
 #include <elf/elf.h>
 #include <sys/types.h>
@@ -48 +47 @@
 #define EE_OK                   0       /* No error */
 #define EE_INVALID              1       /* Invalid ELF image */
-#define EE_MEMORY               2       /* Cannot allocate address space */
+#define EE_MEMORY               2       /* Cannot allocate address space */
 #define EE_INCOMPATIBLE         3       /* ELF image is not compatible with current architecture */
 #define EE_UNSUPPORTED          4       /* Non-supported ELF (e.g. dynamic ELFs) */