15d20a03d
Rob Landley
2006-05-29
Subject
Remove _() and N_() from platform.h. #define them as NOP macros in the two files still using them. I didn't remove them from e2fsck.c to avoid stomping pending cleanup patches from Garrett, and I didn't bother to remove them from fdisk.c because that entire file needs to be rewritten from scratch.
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 →
e2fsprogs/e2fsck.c+3 -0
| @@ -39,6 +39,9 @@ | |
| #include "e2fsck.h" /*Put all of our defines here to clean things up*/ | |
| + | #define _(x) x |
| + | #define N_(x) x |
| + | |
| /* | |
| * Procedure declarations | |
| */ | |
include/platform.h+4 -12
| @@ -97,18 +97,16 @@ | |
| #endif | |
| /* ---- Endian Detection ------------------------------------ */ | |
| - | #if !defined __APPLE__ && !(defined __digital__ && defined __unix__) |
| - | # include <byteswap.h> |
| - | # include <endian.h> |
| - | #endif |
| #if (defined __digital__ && defined __unix__) | |
| # include <sex.h> | |
| # define __BIG_ENDIAN__ (BYTE_ORDER == BIG_ENDIAN) | |
| # define __BYTE_ORDER BYTE_ORDER | |
| + | #elif !defined __APPLE__ |
| + | # include <byteswap.h> |
| + | # include <endian.h> |
| #endif | |
| - | |
| #ifdef __BIG_ENDIAN__ | |
| # define BB_BIG_ENDIAN 1 | |
| # define BB_LITTLE_ENDIAN 0 | |
| @@ -188,13 +186,7 @@ typedef unsigned long long int uintmax_t; | |
| #define PRIu32 "u" | |
| #endif | |
| - | |
| - | /* NLS stuff */ |
| - | /* THIS SHOULD BE CLEANED OUT OF THE TREE ENTIRELY */ |
| - | #define _(Text) Text |
| - | #define N_(Text) (Text) |
| - | |
| - | /* THIS SHOULD BE CLEANED OUT OF THE TREE ENTIRELY */ |
| + | // Need to implement fdprintf for platforms that haven't got dprintf. |
| #define fdprintf dprintf | |
| /* THIS SHOULD BE CLEANED OUT OF THE TREE ENTIRELY */ | |
util-linux/fdisk.c+2 -0
| @@ -10,6 +10,8 @@ | |
| #define UTIL_LINUX_VERSION "2.12" | |
| + | #define _(x) x |
| + | |
| #define PROC_PARTITIONS "/proc/partitions" | |
| #include <features.h> | |