proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 11:25:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2005-03-16 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

Browse Source 
* zebra.h: Must check whether __attribute__ should be defined before
	  including zassert.h.

	[backport candidate]
This commit is contained in:
ajs 2005-03-16 16:13:06 +00:00
parent 55468c8604
commit db8eaac661
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ChangeLog
View File

@ -1,3 +1,8 @@
2005-03-16 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* zebra.h: Must check whether __attribute__ should be defined before
including zassert.h.
2005-03-14 Paul Jakma <paul.jakma@sun.com> 2005-03-14 Paul Jakma <paul.jakma@sun.com>
* command.c: (sort_node) use vector_max instead of referencing * command.c: (sort_node) use vector_max instead of referencing

15
lib/zebra.h
View File

@ -109,7 +109,7 @@ typedef int socklen_t;
#endif /* __va_copy */ #endif /* __va_copy */
#endif /* !va_copy */ #endif /* !va_copy */
#endif /* !C99 */ #endif /* !C99 */
#include "zassert.h"
#ifdef HAVE_LCAPS #ifdef HAVE_LCAPS
#include <sys/capability.h> #include <sys/capability.h>
@ -222,6 +222,14 @@ typedef int socklen_t;
#endif /* BSDI_NRL */ #endif /* BSDI_NRL */
/* Local includes: */
#if !(defined(__GNUC__) || defined(VTYSH_EXTRACT_PL))
#define __attribute__(x)
#endif /* !__GNUC__ || VTYSH_EXTRACT_PL */
#include "zassert.h"
#ifdef HAVE_BROKEN_CMSG_FIRSTHDR #ifdef HAVE_BROKEN_CMSG_FIRSTHDR
/* This bug is present in Solaris 8 and pre-patch Solaris 9 <sys/socket.h>; /* This bug is present in Solaris 8 and pre-patch Solaris 9 <sys/socket.h>;
please refer to http://bugzilla.quagga.net/show_bug.cgi?id=142 */ please refer to http://bugzilla.quagga.net/show_bug.cgi?id=142 */
@ -273,11 +281,6 @@ typedef int socklen_t;
#endif /* CMSG_LEN */ #endif /* CMSG_LEN */
#if !(defined(__GNUC__) || defined(VTYSH_EXTRACT_PL))
#define __attribute__(x)
#endif /* !__GNUC__ */
/* The definition of struct in_pktinfo is missing in old version of /* The definition of struct in_pktinfo is missing in old version of
GLIBC 2.1 (Redhat 6.1). */ GLIBC 2.1 (Redhat 6.1). */
#if defined (GNU_LINUX) && ! defined (HAVE_INPKTINFO) #if defined (GNU_LINUX) && ! defined (HAVE_INPKTINFO)