projects
/
quagga-debian.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'upstream/1.2.4'
[quagga-debian.git]
/
lib
/
zebra.h
diff --git
a/lib/zebra.h
b/lib/zebra.h
index a405d46eb9f7372500b03462bdb38e3f8766ffac..1bb951fe8f6f749ec40ae49d2a2634e9badd080f 100644
(file)
--- a/
lib/zebra.h
+++ b/
lib/zebra.h
@@
-130,16
+130,6
@@
typedef int socklen_t;
#endif /* !va_copy */
#endif /* !C99 */
#endif /* !va_copy */
#endif /* !C99 */
-
-#ifdef HAVE_LCAPS
-#include <sys/capability.h>
-#include <sys/prctl.h>
-#endif /* HAVE_LCAPS */
-
-#ifdef HAVE_SOLARIS_CAPABILITIES
-#include <priv.h>
-#endif /* HAVE_SOLARIS_CAPABILITIES */
-
/* network include group */
#include <sys/socket.h>
/* network include group */
#include <sys/socket.h>
@@
-224,6
+214,16
@@
typedef int socklen_t;
#include <netinet6/nd6.h>
#endif /* HAVE_NETINET6_ND6_H */
#include <netinet6/nd6.h>
#endif /* HAVE_NETINET6_ND6_H */
+/* Privileges / capabilities */
+#ifdef HAVE_LCAPS
+#include <sys/capability.h>
+#include <sys/prctl.h>
+#endif /* HAVE_LCAPS */
+
+#ifdef HAVE_SOLARIS_CAPABILITIES
+#include <priv.h>
+#endif /* HAVE_SOLARIS_CAPABILITIES */
+
/* Some systems do not define UINT32_MAX, etc.. from inttypes.h
* e.g. this makes life easier for FBSD 4.11 users.
*/
/* Some systems do not define UINT32_MAX, etc.. from inttypes.h
* e.g. this makes life easier for FBSD 4.11 users.
*/