summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2009-06-20 08:58:03 +0000
committerRalf Baechle <ralf@linux-mips.org>2009-06-20 08:58:03 +0000
commitbb128be6551cf26893a27d3964914915046a5098 (patch)
treeb7d9106e38c124a8d6b326e75ab6dd5cd945ac33
parent87e9414804ea39313133c64e6b25c0c6fd3b9c3e (diff)
Update libax25 copies of libc headers.
kernel_ax25.h, kernel_netrom.h and kernel_rose.h are outdated copies from libc; upgrade them from glibc 2.10.
-rw-r--r--kernel_ax25.h23
-rw-r--r--kernel_netrom.h18
-rw-r--r--kernel_rose.h16
3 files changed, 29 insertions, 28 deletions
diff --git a/kernel_ax25.h b/kernel_ax25.h
index 093ffb2..e1b6abb 100644
--- a/kernel_ax25.h
+++ b/kernel_ax25.h
@@ -1,20 +1,20 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
#ifndef _NETAX25_AX25_H
#define _NETAX25_AX25_H 1
@@ -33,6 +33,7 @@
#define AX25_N2 3
#define AX25_BACKOFF 6
#define AX25_EXTSEQ 7
+#define AX25_PIDINCL 8
#define AX25_IDLE 9
#define AX25_PACLEN 10
#define AX25_IPMAXQUEUE 11
@@ -109,7 +110,7 @@ struct ax25_ctl_struct
ax25_address digi_addr[AX25_MAX_DIGIS];
};
-struct ax25_info_struct
+struct ax25_info_struct
{
unsigned int n2, n2count;
unsigned int t1, t1timer;
@@ -120,7 +121,7 @@ struct ax25_info_struct
unsigned int rcv_q, snd_q;
};
-struct ax25_fwd_struct
+struct ax25_fwd_struct
{
ax25_address port_from;
ax25_address port_to;
diff --git a/kernel_netrom.h b/kernel_netrom.h
index 2255d18..4984772 100644
--- a/kernel_netrom.h
+++ b/kernel_netrom.h
@@ -2,24 +2,24 @@
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
#ifndef _NETROM_NETROM_H
#define _NETROM_NETROM_H 1
-/*#include <netax25/ax25.h>*/
+#include <netax25/ax25.h>
/* Setsockoptions(2) level. Thanks to BSD these must match IPPROTO_xxx. */
#define SOL_NETROM 259
diff --git a/kernel_rose.h b/kernel_rose.h
index 1e93b6b..e4ba7d7 100644
--- a/kernel_rose.h
+++ b/kernel_rose.h
@@ -3,19 +3,19 @@
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
/* What follows is copied from the 2.1.93 <linux/rose.h>. */