b623a542d
Rob Landley
2006-05-31
Subject
Header file cleanup. platform.h apparently needs to be included early on so it can figure out what header files to include, and override stuff that comes later. But applets shouldn't include platform.h directly, they should include busybox.h or libbb.h. Since busybox.h already includes libbb.h, m
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/busybox.h+0 -27
| @@ -9,15 +9,6 @@ | |
| #include "bb_config.h" | |
| - | #include <stdio.h> |
| - | #include <stdlib.h> |
| - | #include <stdarg.h> |
| - | #include <sys/types.h> |
| - | #include <sys/stat.h> |
| - | |
| - | extern const char BB_BANNER[]; |
| - | |
| - | /* Pull in the utility routines from libbb */ |
| #include "libbb.h" | |
| enum Location { | |
| @@ -54,22 +45,4 @@ extern const struct BB_applet applets[]; | |
| #include "applets.h" | |
| #undef PROTOTYPES | |
| - | #ifndef RB_POWER_OFF |
| - | /* Stop system and switch power off if possible. */ |
| - | #define RB_POWER_OFF 0x4321fedc |
| - | #endif |
| - | |
| - | /* Try to pull in PATH_MAX */ |
| - | #include <limits.h> |
| - | |
| - | /* for PATH_MAX on systems that don't have it in limits.h */ |
| - | #include <sys/param.h> |
| - | #ifndef PATH_MAX |
| - | #define PATH_MAX 256 |
| - | #endif |
| - | |
| - | #ifdef DMALLOC |
| - | #include <dmalloc.h> |
| - | #endif |
| - | |
| #endif /* _BB_INTERNAL_H_ */ | |
include/libbb.h+21 -9
| @@ -11,23 +11,22 @@ | |
| #ifndef __LIBBUSYBOX_H__ | |
| #define __LIBBUSYBOX_H__ 1 | |
| + | #include "bb_config.h" |
| #include "platform.h" | |
| + | #include <dirent.h> |
| + | #include <inttypes.h> |
| + | #include <netdb.h> |
| #include <stdio.h> | |
| #include <stdlib.h> | |
| #include <stdarg.h> | |
| - | #include <sys/types.h> |
| #include <sys/stat.h> | |
| + | #include <sys/time.h> |
| + | #include <sys/types.h> |
| #include <termios.h> | |
| - | #include <dirent.h> |
| - | #include <netinet/in.h> |
| - | #include <netdb.h> |
| - | #include <inttypes.h> |
| - | #include <sys/time.h> |
| - | #include "bb_config.h" |
| #ifdef CONFIG_SELINUX | |
| #include <selinux/selinux.h> | |
| #endif | |
| @@ -526,9 +525,22 @@ void *md5_end(void *resbuf, md5_ctx_t *ctx); | |
| extern uint32_t *bb_crc32_filltable (int endian); | |
| - | /* busybox.h will include dmalloc later for us, else include it here. */ |
| - | #if !defined _BB_INTERNAL_H_ && defined DMALLOC |
| + | #ifndef RB_POWER_OFF |
| + | /* Stop system and switch power off if possible. */ |
| + | #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__ */ | |