d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use standards visibility conditionals to conditionalize most of this

Browse Source 
header (details on how the visibility conditionals work are available
in <sys/cdefs.h>).  Use standard types instead of BSD specific ones,
so that this header compiles in the standards case (specifically this
means changing `u_int' to `unsigned int').
This commit is contained in:
Mike Barcroft 2002-10-02 07:44:50 +00:00
parent 316ec49abd
commit f2ba8326cd
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=104355
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/net/if.h
View File

@ -37,10 +37,13 @@
#ifndef _NET_IF_H_
#define _NET_IF_H_
#include <sys/cdefs.h>
#ifdef _KERNEL
#include <sys/queue.h>
#endif
#if __BSD_VISIBLE
/*
* <net/if.h> does not depend on <sys/time.h> on most other systems. This
* helps userland compatibility. (struct timeval ifi_lastchange)
@ -50,14 +53,17 @@
#endif
struct ifnet;
#endif
/*
* Length of interface external name, including terminating '\0'.
* Note: this is the same size as a generic device's external name.
*/
#define IFNAMSIZ 16
#define IF_NAMESIZE IFNAMSIZ
#define IF_NAMESIZE 16
#if __BSD_VISIBLE
#define IFNAMSIZ IF_NAMESIZE
#define IF_MAXUNIT 0x7fff /* ifp->if_unit is only 15 bits */
#endif
#ifdef _KERNEL
/*
@ -80,6 +86,8 @@ struct if_clone {
{ { 0 }, name, sizeof(name) - 1, minifs, maxunit, NULL, 0, create, destroy }
#endif
#if __BSD_VISIBLE
/*
* Structure used to query names of interface cloners.
*/
@ -315,6 +323,8 @@ struct if_laddrreq {
struct sockaddr_storage dstaddr; /* out */
};
#endif /* __BSD_VISIBLE */
#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_IFADDR);
@ -324,13 +334,13 @@ MALLOC_DECLARE(M_IFMADDR);
#ifndef _KERNEL
struct if_nameindex {
u_int if_index; /* 1, 2, ... */
unsigned int if_index; /* 1, 2, ... */
char *if_name; /* null terminated name: "le0", ... */
};
__BEGIN_DECLS
u_int if_nametoindex(const char *);
char *if_indextoname(u_int, char *);
unsigned int if_nametoindex(const char *);
char *if_indextoname(unsigned int, char *);
struct if_nameindex *if_nameindex(void);
void if_freenameindex(struct if_nameindex *);
__END_DECLS