Differences from 'svn diff -x -Bbw' are trivially verifiable as only style(9).
This commit is contained in:
David E. O'Brien 2009-01-01 02:11:01 +00:00
parent 0d8e9662bd
commit 7c9c0cb8fd
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=186668
2 changed files with 11 additions and 12 deletions

View file

@ -29,13 +29,13 @@
*/
#ifndef _SYS_IMGACT_ELF_H_
#define _SYS_IMGACT_ELF_H_
#define _SYS_IMGACT_ELF_H_
#include <machine/elf.h>
#ifdef _KERNEL
#define AUXARGS_ENTRY(pos, id, val) {suword(pos++, id); suword(pos++, val);}
#define AUXARGS_ENTRY(pos, id, val) {suword(pos++, id); suword(pos++, val);}
struct thread;
@ -62,14 +62,14 @@ typedef struct {
const char *interp_path;
struct sysentvec *sysvec;
const char *interp_newpath;
int flags;
#define BI_CAN_EXEC_DYN 0x0001
int flags;
#define BI_CAN_EXEC_DYN 0x0001
} __ElfN(Brandinfo);
__ElfType(Auxargs);
__ElfType(Brandinfo);
#define MAX_BRANDS 8
#define MAX_BRANDS 8
int __elfN(brand_inuse)(Elf_Brandinfo *entry);
int __elfN(insert_brand_entry)(Elf_Brandinfo *entry);
@ -80,7 +80,7 @@ int __elfN(coredump)(struct thread *, struct vnode *, off_t);
/* Machine specific function to dump per-thread information. */
void __elfN(dump_thread)(struct thread *, void *, size_t *);
extern int __elfN(fallback_brand);
int __elfN(fallback_brand);
#endif /* _KERNEL */

View file

@ -39,7 +39,7 @@
*/
#ifndef _SYS_LINK_ELF_H_
#define _SYS_LINK_ELF_H_
#define _SYS_LINK_ELF_H_
#include <sys/elf.h>
@ -70,9 +70,9 @@ struct r_debug {
void (*r_brk)(struct r_debug *, struct link_map *);
/* pointer to break point */
enum {
RT_CONSISTENT, /* things are stable */
RT_ADD, /* adding a shared library */
RT_DELETE /* removing a shared library */
RT_CONSISTENT, /* things are stable */
RT_ADD, /* adding a shared library */
RT_DELETE /* removing a shared library */
} r_state;
};
@ -90,8 +90,7 @@ struct dl_phdr_info
__BEGIN_DECLS
typedef int (*__dl_iterate_hdr_callback)(struct dl_phdr_info *, size_t,
void *);
typedef int (*__dl_iterate_hdr_callback)(struct dl_phdr_info *, size_t, void *);
extern int dl_iterate_phdr(__dl_iterate_hdr_callback, void *);
__END_DECLS