Header cleanup on two more networking files (move libbb.h to the top and

remove #includes that libbb.h already does), plus a minor cleanup of
libbb.h to move #includes towards the top of the file where we can see 'em.

1 files changed, 13 insertions, 16 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 4293d394b..18ad8419f 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -25,8 +25,6 @@
 #include <sys/types.h>
 #include <termios.h>
 
-
-
 #ifdef CONFIG_SELINUX
 #include <selinux/selinux.h>
 #endif
@@ -40,6 +38,17 @@
 # include "sha1.h"
 #endif
 
+/* Try to pull in PATH_MAX */
+#include <limits.h>
+#include <sys/param.h>
+#ifndef PATH_MAX
+#define  PATH_MAX         256
+#endif
+
+#ifdef DMALLOC
+#include <dmalloc.h>
+#endif
+
 /* Some useful definitions */
 #undef FALSE
 #define FALSE   ((int) 0)
@@ -457,12 +466,11 @@ extern void bb_xread_all(int fd, void *buf, size_t count);
 extern unsigned char bb_xread_char(int fd);
 
 #ifndef COMM_LEN
-/*#include <sched.h> *//* Task command name length */
 #ifdef TASK_COMM_LEN
 #define COMM_LEN TASK_COMM_LEN
 #else
-#define COMM_LEN 16 /* synchronize with size of comm in struct task_struct
-                                                                  in /usr/include/linux/sched.h */
+/* synchronize with sizeof(task_struct.comm) in /usr/include/linux/sched.h */
+#define COMM_LEN 16
 #endif
 #endif
 typedef struct {
@@ -530,17 +538,6 @@ extern uint32_t *bb_crc32_filltable (int endian);
 #define RB_POWER_OFF   0x4321fedc
 #endif
 
-/* Try to pull in PATH_MAX */
-#include <limits.h>
-#include <sys/param.h>
-#ifndef PATH_MAX
-#define  PATH_MAX         256
-#endif
-
-#ifdef DMALLOC
-#include <dmalloc.h>
-#endif
-
 extern const char BB_BANNER[];
 
 #endif /* __LIBBUSYBOX_H__ */