Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

u_char, u_int, u_long -> unsigned char, unsigned, unsigned long

Browse Source 
This makes these headers work without _NETBSD_SOURCE.
This commit is contained in:
dholland 2016-01-22 21:55:57 +00:00
parent 673c699d5d
commit 888c134026
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/bm.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bm.h,v 1.5 2005/02/03 04:39:32 perry Exp $ */ /* $NetBSD: bm.h,v 1.6 2016/01/22 21:55:57 dholland Exp $ */
/*- /*-
* Copyright (c) 1994 * Copyright (c) 1994
@ -38,7 +38,7 @@
#define _BM_H_ #define _BM_H_
typedef struct { typedef struct {
u_char *pat; /* pattern */ unsigned char *pat; /* pattern */
size_t patlen; /* pattern length */ size_t patlen; /* pattern length */
size_t *delta; /* skip delta */ size_t *delta; /* skip delta */
int rarec; /* rare character */ int rarec; /* rare character */
@ -49,8 +49,8 @@ typedef struct {
#include <sys/cdefs.h> #include <sys/cdefs.h>
__BEGIN_DECLS __BEGIN_DECLS
bm_pat *bm_comp(u_char const *, size_t, u_char const *); bm_pat *bm_comp(unsigned char const *, size_t, unsigned char const *);
u_char *bm_exec(bm_pat *, u_char *, size_t); unsigned char *bm_exec(bm_pat *, unsigned char *, size_t);
void bm_free(bm_pat *); void bm_free(bm_pat *);
__END_DECLS __END_DECLS

4
include/ifaddrs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ifaddrs.h,v 1.5 2005/02/03 04:39:32 perry Exp $ */ /* $NetBSD: ifaddrs.h,v 1.6 2016/01/22 21:55:57 dholland Exp $ */
/* /*
* Copyright (c) 1995, 1999 * Copyright (c) 1995, 1999
@ -31,7 +31,7 @@
struct ifaddrs { struct ifaddrs {
struct ifaddrs *ifa_next; struct ifaddrs *ifa_next;
char *ifa_name; char *ifa_name;
u_int ifa_flags; unsigned ifa_flags;
struct sockaddr *ifa_addr; struct sockaddr *ifa_addr;
struct sockaddr *ifa_netmask; struct sockaddr *ifa_netmask;
struct sockaddr *ifa_dstaddr; struct sockaddr *ifa_dstaddr;

8
include/kvm.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: kvm.h,v 1.16 2011/09/12 21:14:29 christos Exp $ */ /* $NetBSD: kvm.h,v 1.17 2016/01/22 21:55:57 dholland Exp $ */
/*- /*-
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -71,7 +71,7 @@ char *kvm_geterr(kvm_t *);
int kvm_getloadavg(kvm_t *, double [], int); int kvm_getloadavg(kvm_t *, double [], int);
char *kvm_getfiles(kvm_t *, int, int, int *); char *kvm_getfiles(kvm_t *, int, int, int *);
struct kinfo_lwp * struct kinfo_lwp *
kvm_getlwps(kvm_t *, int, u_long, size_t, int *); kvm_getlwps(kvm_t *, int, unsigned long, size_t, int *);
struct kinfo_proc2 * struct kinfo_proc2 *
kvm_getproc2(kvm_t *, int, int, size_t, int *); kvm_getproc2(kvm_t *, int, int, size_t, int *);
struct kinfo_proc * struct kinfo_proc *
@ -80,8 +80,8 @@ int kvm_nlist(kvm_t *, struct nlist *);
kvm_t *kvm_open kvm_t *kvm_open
(const char *, const char *, const char *, int, const char *); (const char *, const char *, const char *, int, const char *);
kvm_t *kvm_openfiles(const char *, const char *, const char *, int, char *); kvm_t *kvm_openfiles(const char *, const char *, const char *, int, char *);
ssize_t kvm_read(kvm_t *, u_long, void *, size_t); ssize_t kvm_read(kvm_t *, unsigned long, void *, size_t);
ssize_t kvm_write(kvm_t *, u_long, const void *, size_t); ssize_t kvm_write(kvm_t *, unsigned long, const void *, size_t);
const char *kvm_getkernelname(kvm_t *); const char *kvm_getkernelname(kvm_t *);
__END_DECLS __END_DECLS

8
include/link_aout.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: link_aout.h,v 1.21 2008/04/28 20:22:54 martin Exp $ */ /* $NetBSD: link_aout.h,v 1.22 2016/01/22 21:55:57 dholland Exp $ */
/*- /*-
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -52,7 +52,7 @@
struct sod { /* Shared Object Descriptor */ struct sod { /* Shared Object Descriptor */
long sod_name; /* name (relative to load address) */ long sod_name; /* name (relative to load address) */
u_int sod_library : 1, /* Searched for by library rules */ unsigned sod_library : 1, /* Searched for by library rules */
sod_reserved : 31; sod_reserved : 31;
short sod_major; /* major version number */ short sod_major; /* major version number */
short sod_minor; /* minor version number */ short sod_minor; /* minor version number */
@ -71,7 +71,7 @@ struct so_map { /* Shared Object Map */
struct so_map *som_next; /* Next map in chain */ struct so_map *som_next; /* Next map in chain */
struct sod *som_sod; /* Sod responsible for this map */ struct sod *som_sod; /* Sod responsible for this map */
caddr_t som_sodbase; /* Base address of this sod */ caddr_t som_sodbase; /* Base address of this sod */
u_int som_write : 1; /* Text is currently writable */ unsigned som_write : 1; /* Text is currently writable */
struct _dynamic *som_dynamic; /* _dynamic structure */ struct _dynamic *som_dynamic; /* _dynamic structure */
caddr_t som_spd; /* Private data */ caddr_t som_spd; /* Private data */
}; };
@ -85,7 +85,7 @@ struct so_map { /* Shared Object Map */
*/ */
struct nzlist { struct nzlist {
struct nlist nlist; struct nlist nlist;
u_long nz_size; unsigned long nz_size;
#define nz_un nlist.n_un #define nz_un nlist.n_un
#define nz_strx nlist.n_un.n_strx #define nz_strx nlist.n_un.n_strx
#define nz_name nlist.n_un.n_name #define nz_name nlist.n_un.n_name

8
include/login_cap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: login_cap.h,v 1.11 2009/01/11 03:04:12 christos Exp $ */ /* $NetBSD: login_cap.h,v 1.12 2016/01/22 21:55:57 dholland Exp $ */
/*- /*-
* Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved. * Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved.
@ -73,15 +73,15 @@ login_cap_t *login_getpwclass(const struct passwd *)
__RENAME(__login_getpwclass50); __RENAME(__login_getpwclass50);
#endif #endif
void login_close(login_cap_t *); void login_close(login_cap_t *);
int login_getcapbool(login_cap_t *, const char *, u_int); int login_getcapbool(login_cap_t *, const char *, unsigned);
quad_t login_getcapnum(login_cap_t *, const char *, quad_t, quad_t); quad_t login_getcapnum(login_cap_t *, const char *, quad_t, quad_t);
quad_t login_getcapsize(login_cap_t *, const char *, quad_t, quad_t); quad_t login_getcapsize(login_cap_t *, const char *, quad_t, quad_t);
char *login_getcapstr(login_cap_t *, const char *, char *, char *); char *login_getcapstr(login_cap_t *, const char *, char *, char *);
quad_t login_getcaptime(login_cap_t *, const char *, quad_t, quad_t); quad_t login_getcaptime(login_cap_t *, const char *, quad_t, quad_t);
int setclasscontext(const char *, u_int); int setclasscontext(const char *, unsigned);
#ifndef __LIBC12_SOURCE__ #ifndef __LIBC12_SOURCE__
int setusercontext(login_cap_t *, struct passwd *, uid_t, u_int) int setusercontext(login_cap_t *, struct passwd *, uid_t, unsigned)
__RENAME(__setusercontext50); __RENAME(__setusercontext50);
#endif #endif
void setuserpath(login_cap_t *, const char *, envfunc_t, void *); void setuserpath(login_cap_t *, const char *, envfunc_t, void *);

10
include/nsswitch.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: nsswitch.h,v 1.21 2011/07/17 20:54:34 joerg Exp $ */ /* $NetBSD: nsswitch.h,v 1.22 2016/01/22 21:55:57 dholland Exp $ */
/*- /*-
* Copyright (c) 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc. * Copyright (c) 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc.
@ -175,8 +175,8 @@ typedef struct {
* nss_module_unregister_fn - module un-registration function * nss_module_unregister_fn - module un-registration function
* called at module unload * called at module unload
*/ */
typedef void (*nss_module_unregister_fn)(ns_mtab *, u_int); typedef void (*nss_module_unregister_fn)(ns_mtab *, unsigned);
typedef ns_mtab *(*nss_module_register_fn)(const char *, u_int *, typedef ns_mtab *(*nss_module_register_fn)(const char *, unsigned *,
nss_module_unregister_fn *); nss_module_unregister_fn *);
#ifdef _NS_PRIVATE #ifdef _NS_PRIVATE
@ -193,7 +193,7 @@ typedef ns_mtab *(*nss_module_register_fn)(const char *, u_int *,
typedef struct { typedef struct {
const char *name; /* name of database */ const char *name; /* name of database */
ns_src *srclist; /* list of sources */ ns_src *srclist; /* list of sources */
u_int srclistsize; /* size of srclist */ unsigned srclistsize; /* size of srclist */
} ns_dbt; } ns_dbt;
/* /*
@ -203,7 +203,7 @@ typedef struct {
const char *name; /* module name */ const char *name; /* module name */
void *handle; /* handle from dlopen() */ void *handle; /* handle from dlopen() */
ns_mtab *mtab; /* method table */ ns_mtab *mtab; /* method table */
u_int mtabsize; /* size of mtab */ unsigned mtabsize; /* size of mtab */
/* called to unload module */ /* called to unload module */
nss_module_unregister_fn unregister; nss_module_unregister_fn unregister;
} ns_mod; } ns_mod;