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

Moved some declarations from <sys/socket.h> to the correct places, and

Browse Source 
fixed everything that depended on them being misplaced.
This commit is contained in:
bde 1997-12-21 16:35:12 +00:00
parent eea70ed327
commit 7fb46d4921
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/netipx/ipx_ip.c
View File

@ -33,7 +33,7 @@
*
* @(#)ipx_ip.c
*
* $Id: ipx_ip.c,v 1.16 1997/06/26 19:35:47 jhay Exp $
* $Id: ipx_ip.c,v 1.17 1997/12/15 20:31:13 eivind Exp $
*/
/*
@ -49,6 +49,7 @@
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/sockio.h>
#include <net/if.h>

3
sys/sys/protosw.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)protosw.h 8.1 (Berkeley) 6/2/93
* $Id: protosw.h,v 1.20 1997/08/16 19:16:13 wollman Exp $
* $Id: protosw.h,v 1.21 1997/09/14 02:25:40 peter Exp $
*/
#ifndef _SYS_PROTOSW_H_
@ -310,6 +310,7 @@ char *prcorequests[] = {
#endif
#ifdef KERNEL
void pfctlinput __P((int, struct sockaddr *));
struct protosw *pffindproto __P((int family, int protocol, int type));
struct protosw *pffindtype __P((int family, int type));
#endif

10
sys/sys/socket.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)socket.h 8.4 (Berkeley) 2/21/94
* $Id: socket.h,v 1.21 1997/08/16 19:16:14 wollman Exp $
* $Id: socket.h,v 1.22 1997/10/12 20:26:04 phk Exp $
*/
#ifndef _SYS_SOCKET_H_
@ -378,12 +378,6 @@ int socket __P((int, int, int));
int socketpair __P((int, int, int, int *));
__END_DECLS
#else /* KERNEL */
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_SOCKET);
MALLOC_DECLARE(M_SONAME);
MALLOC_DECLARE(M_PCB);
#endif
void pfctlinput __P((int, struct sockaddr *));
#endif /* !KERNEL */
#endif /* !_SYS_SOCKET_H_ */

10
sys/sys/socketvar.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)socketvar.h 8.3 (Berkeley) 2/19/95
* $Id: socketvar.h,v 1.21 1997/08/16 19:16:14 wollman Exp $
* $Id: socketvar.h,v 1.22 1997/09/14 02:25:41 peter Exp $
*/
#ifndef _SYS_SOCKETVAR_H_
@ -198,6 +198,13 @@ struct socket {
#define sowwakeup(so) sowakeup((so), &(so)->so_snd)
#ifdef KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_PCB);
MALLOC_DECLARE(M_SOCKET);
MALLOC_DECLARE(M_SONAME);
#endif
extern u_long sb_max;
struct filedesc;
@ -277,6 +284,7 @@ int sosetopt __P((struct socket *so, int level, int optname,
struct mbuf *m0, struct proc *p));
int soshutdown __P((struct socket *so, int how));
void sowakeup __P((struct socket *so, struct sockbuf *sb));
#endif /* KERNEL */
#endif /* !_SYS_SOCKETVAR_H_ */