diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-07-29 09:41:54 +0000 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2014-08-18 01:50:19 +0200 |
| commit | 16ffb26fbbf8b3d1fee7a14eb401ecb02eed5058 (patch) | |
| tree | f1abb4a88c2677f1e405a855be200056c5c2bc4e | |
| parent | 28a8cfcbc3a5cc74bb3b87981b878f8b4edc2dd6 (diff) | |
| download | quagga-16ffb26fbbf8b3d1fee7a14eb401ecb02eed5058.tar.bz2 quagga-16ffb26fbbf8b3d1fee7a14eb401ecb02eed5058.tar.xz | |
*: fix detection and usage of sys/cdefs.h
This header is non-standard (though present on many systems) and
there is no standard for what it should or should not define.
Remove it where it is not really needed. But add also a configure
check, so it can be used if available but otherwise fallback to
defining the needed macroes.
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
| -rwxr-xr-x | configure.ac | 2 | ||||
| -rw-r--r-- | isisd/include-netbsd/iso.h | 2 | ||||
| -rw-r--r-- | lib/queue.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 220124ab..3dba3b35 100755 --- a/configure.ac +++ b/configure.ac @@ -442,7 +442,7 @@ dnl Check other header files. dnl ------------------------- AC_CHECK_HEADERS([stropts.h sys/ksym.h sys/times.h sys/select.h \ sys/types.h linux/version.h netdb.h asm/types.h \ - sys/param.h limits.h signal.h \ + sys/cdefs.h sys/param.h limits.h signal.h \ sys/socket.h netinet/in.h time.h sys/time.h]) dnl Utility macro to avoid retyping includes all the time diff --git a/isisd/include-netbsd/iso.h b/isisd/include-netbsd/iso.h index 1a80aec8..42b9bc88 100644 --- a/isisd/include-netbsd/iso.h +++ b/isisd/include-netbsd/iso.h @@ -192,7 +192,7 @@ extern struct protosw isosw[]; #else /* user utilities definitions from the iso library */ -#ifdef SUNOS_5 +#ifndef HAVE_SYS_CDEFS_H #define __P(x) x #define __BEGIN_DECLS #define __END_DECLS diff --git a/lib/queue.h b/lib/queue.h index 70cffab1..48b363e2 100644 --- a/lib/queue.h +++ b/lib/queue.h @@ -33,8 +33,6 @@ #ifndef _SYS_QUEUE_H_ #define _SYS_QUEUE_H_ -#include <sys/cdefs.h> - /* * This file defines four types of data structures: singly-linked lists, * singly-linked tail queues, lists and tail queues. |