svn commit: trunk/uClibc/libc/inet

[aldot at uclibc.org]

Author: aldot
Date: 2008-10-19 10:03:03 -0700 (Sun, 19 Oct 2008)
New Revision: 23721

Log:
- do not include netlink headers if netlink is turned off (Michael Deutschmann)
  Closes #5544


Modified:
   trunk/uClibc/libc/inet/netlinkaccess.h


Changeset:
Modified: trunk/uClibc/libc/inet/netlinkaccess.h
===================================================================
--- trunk/uClibc/libc/inet/netlinkaccess.h	2008-10-19 13:27:09 UTC (rev 23720)
+++ trunk/uClibc/libc/inet/netlinkaccess.h	2008-10-19 17:03:03 UTC (rev 23721)
@@ -19,6 +19,8 @@
 #ifndef _NETLINKACCESS_H
 #define _NETLINKACCESS_H 1
 
+#ifdef __UCLIBC_USE_NETLINK__
+
 #include <features.h>
 #include <stdint.h>
 #include <unistd.h>
@@ -33,16 +35,6 @@
 #include <linux/rtnetlink.h>
 #include <linux/netlink.h>
 
-/* Should prob be a configure option or something */
-#ifndef __ASSUME_NETLINK_SUPPORT
-#ifdef __UCLIBC_USE_NETLINK__
-# define __ASSUME_NETLINK_SUPPORT 1
-#else
-# define __ASSUME_NETLINK_SUPPORT 0
-#endif
-#endif
-
-
 struct netlink_res
 {
   struct netlink_res *next;
@@ -62,6 +54,10 @@
 };
 
 
+#ifndef __ASSUME_NETLINK_SUPPORT
+#define __ASSUME_NETLINK_SUPPORT 1
+#endif
+
 #ifdef __UCLIBC_SUPPORT_AI_ADDRCONFIG__
 #if __ASSUME_NETLINK_SUPPORT == 0
 extern smallint __no_netlink_support attribute_hidden;
@@ -76,5 +72,8 @@
 extern void __netlink_free_handle (struct netlink_handle *h) attribute_hidden;
 extern int __netlink_request (struct netlink_handle *h, int type) attribute_hidden;
 
+#else /* __UCLIBC_USE_NETLINK__ */
+#define __ASSUME_NETLINK_SUPPORT 0
+#endif
 
-#endif /* netlinkaccess.h */
+#endif /* _NETLINKACCESS_H */