about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/bzero.c4
-rw-r--r--sysdeps/unix/sysv/linux/netrose/rose.h8
2 files changed, 8 insertions, 4 deletions
diff --git a/sysdeps/generic/bzero.c b/sysdeps/generic/bzero.c
index 002af2f0a3..229fcd365f 100644
--- a/sysdeps/generic/bzero.c
+++ b/sysdeps/generic/bzero.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Torbjorn Granlund (tege@sics.se).
 
@@ -20,6 +20,8 @@
 #include <string.h>
 #include <memcopy.h>
 
+#undef __bzero
+
 /* Set N bytes of S to 0.  */
 void
 __bzero (s, len)
diff --git a/sysdeps/unix/sysv/linux/netrose/rose.h b/sysdeps/unix/sysv/linux/netrose/rose.h
index 1c7d5d5a1f..1e93b6b4d3 100644
--- a/sysdeps/unix/sysv/linux/netrose/rose.h
+++ b/sysdeps/unix/sysv/linux/netrose/rose.h
@@ -1,5 +1,5 @@
 /* Definitions for Rose packet radio address family.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 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
@@ -31,6 +31,8 @@
    requires ax25.h for the definition of the ax25_address structure.  */
 #define ROSE_MTU	251
 
+#define ROSE_MAX_DIGIS	6
+
 #define	ROSE_DEFER	1
 #define	ROSE_T1		2
 #define	ROSE_T2		3
@@ -74,7 +76,7 @@ struct sockaddr_rose
   ax25_address	srose_digi;
 };
 
-struct full_sockaddr_rose 
+struct full_sockaddr_rose
 {
   sa_family_t srose_family;
   rose_address srose_addr;
@@ -99,7 +101,7 @@ struct rose_cause_struct
   unsigned char	diagnostic;
 };
 
-struct rose_facilities_struct 
+struct rose_facilities_struct
 {
   rose_address source_addr,   dest_addr;
   ax25_address source_call,   dest_call;