Changeset 371bd7d in mainline for kernel/generic/include/lib/elf.h


Ignore:
Timestamp:
2010-03-27T09:22:17Z (16 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
36a75a2
Parents:
cd82bb1 (diff), eaf22d4 (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:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/lib/elf.h

    rcd82bb1 r371bd7d  
    3737
    3838#include <arch/elf.h>
    39 #include <arch/types.h>
     39#include <typedefs.h>
    4040
    4141/**
    4242 * current ELF version
    4343 */
    44 #define EV_CURRENT      1
    45 
    46 /** 
    47  * ELF types 
     44#define EV_CURRENT      1
     45
     46/**
     47 * ELF types
    4848 */
    4949#define ET_NONE         0       /* No type */
    … …  
    338338#endif
    339339
    340 extern char *elf_error(unsigned int rc);
     340extern const char *elf_error(unsigned int rc);
    341341
    342342/* Interpreter string used to recognize the program loader */
Note: See TracChangeset for help on using the changeset viewer.