diff options
| author | Rob Landley <rob@landley.net> | 2006-06-05 17:35:24 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-06-05 17:35:24 +0000 |
| commit | 362dc2bf3314b3e01d0445acbabaebedb3a94131 (patch) | |
| tree | 7f8847740d40d26316019a033879e1cfcad708d5 /include | |
| parent | 12d87550a3b7b85d2c03e45261e059855db04d1b (diff) | |
| download | busybox-w32-362dc2bf3314b3e01d0445acbabaebedb3a94131.tar.gz busybox-w32-362dc2bf3314b3e01d0445acbabaebedb3a94131.tar.bz2 busybox-w32-362dc2bf3314b3e01d0445acbabaebedb3a94131.zip | |
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 29 |
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 @@ | |||
| 25 | #include <sys/types.h> | 25 | #include <sys/types.h> |
| 26 | #include <termios.h> | 26 | #include <termios.h> |
| 27 | 27 | ||
| 28 | |||
| 29 | |||
| 30 | #ifdef CONFIG_SELINUX | 28 | #ifdef CONFIG_SELINUX |
| 31 | #include <selinux/selinux.h> | 29 | #include <selinux/selinux.h> |
| 32 | #endif | 30 | #endif |
| @@ -40,6 +38,17 @@ | |||
| 40 | # include "sha1.h" | 38 | # include "sha1.h" |
| 41 | #endif | 39 | #endif |
| 42 | 40 | ||
| 41 | /* Try to pull in PATH_MAX */ | ||
| 42 | #include <limits.h> | ||
| 43 | #include <sys/param.h> | ||
| 44 | #ifndef PATH_MAX | ||
| 45 | #define PATH_MAX 256 | ||
| 46 | #endif | ||
| 47 | |||
| 48 | #ifdef DMALLOC | ||
| 49 | #include <dmalloc.h> | ||
| 50 | #endif | ||
| 51 | |||
| 43 | /* Some useful definitions */ | 52 | /* Some useful definitions */ |
| 44 | #undef FALSE | 53 | #undef FALSE |
| 45 | #define FALSE ((int) 0) | 54 | #define FALSE ((int) 0) |
| @@ -457,12 +466,11 @@ extern void bb_xread_all(int fd, void *buf, size_t count); | |||
| 457 | extern unsigned char bb_xread_char(int fd); | 466 | extern unsigned char bb_xread_char(int fd); |
| 458 | 467 | ||
| 459 | #ifndef COMM_LEN | 468 | #ifndef COMM_LEN |
| 460 | /*#include <sched.h> *//* Task command name length */ | ||
| 461 | #ifdef TASK_COMM_LEN | 469 | #ifdef TASK_COMM_LEN |
| 462 | #define COMM_LEN TASK_COMM_LEN | 470 | #define COMM_LEN TASK_COMM_LEN |
| 463 | #else | 471 | #else |
| 464 | #define COMM_LEN 16 /* synchronize with size of comm in struct task_struct | 472 | /* synchronize with sizeof(task_struct.comm) in /usr/include/linux/sched.h */ |
| 465 | in /usr/include/linux/sched.h */ | 473 | #define COMM_LEN 16 |
| 466 | #endif | 474 | #endif |
| 467 | #endif | 475 | #endif |
| 468 | typedef struct { | 476 | typedef struct { |
| @@ -530,17 +538,6 @@ extern uint32_t *bb_crc32_filltable (int endian); | |||
| 530 | #define RB_POWER_OFF 0x4321fedc | 538 | #define RB_POWER_OFF 0x4321fedc |
| 531 | #endif | 539 | #endif |
| 532 | 540 | ||
| 533 | /* Try to pull in PATH_MAX */ | ||
| 534 | #include <limits.h> | ||
| 535 | #include <sys/param.h> | ||
| 536 | #ifndef PATH_MAX | ||
| 537 | #define PATH_MAX 256 | ||
| 538 | #endif | ||
| 539 | |||
| 540 | #ifdef DMALLOC | ||
| 541 | #include <dmalloc.h> | ||
| 542 | #endif | ||
| 543 | |||
| 544 | extern const char BB_BANNER[]; | 541 | extern const char BB_BANNER[]; |
| 545 | 542 | ||
| 546 | #endif /* __LIBBUSYBOX_H__ */ | 543 | #endif /* __LIBBUSYBOX_H__ */ |