ed7bb6278
Bernhard Reutner-Fischer
2006-02-23
Subject
- put NLS stuff in one central place to avoid redefines. Fixes warnings about: fdisk.c:45:1: warning: "_" redefined nfsmount.c:121:1: warning: "_" redefined nfsmount.c:122:1: warning: "N_" redefined interface.c:84:1: warning: "_" redefined
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/e2fsbb.h +0 -4include/platform.h +5 -1networking/interface.c +0 -1util-linux/fdisk.c +0 -2util-linux/nfsmount.c +1 -3
e2fsprogs/e2fsbb.h+0 -4
| @@ -26,10 +26,6 @@ typedef long errcode_t; | |
| #define ERRCODE_RANGE 8 | |
| #define error_message(code) strerror((int) (code & ((1<<ERRCODE_RANGE)-1))) | |
| - | /* NLS crap */ |
| - | #define _(x) x |
| - | #define N_(x) x |
| - | |
| /* misc crap */ | |
| #define fatal_error(err, msg) bb_error_msg_and_die(msg) | |
| #define usage() bb_show_usage() | |
include/platform.h+5 -1
| @@ -88,9 +88,13 @@ | |
| #define BB_BIG_ENDIAN 1 | |
| #elif __BYTE_ORDER == __BIG_ENDIAN | |
| #define BB_BIG_ENDIAN 1 | |
| - | #else |
| + | #else |
| #define BB_BIG_ENDIAN 0 | |
| #endif | |
| + | /* ---- miscellaneous --------------------------------------- */ |
| + | /* NLS stuff */ |
| + | #define _(Text) Text |
| + | #define N_(Text) (Text) |
| #endif /* platform.h */ | |
networking/interface.c+0 -1
| @@ -81,7 +81,6 @@ | |
| # undef HAVE_AFINET6 | |
| #endif | |
| - | #define _(x) x |
| #define _PATH_PROCNET_DEV "/proc/net/dev" | |
| #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6" | |
| #define new(p) ((p) = xcalloc(1,sizeof(*(p)))) | |
util-linux/fdisk.c+0 -2
| @@ -42,8 +42,6 @@ | |
| #define DKTYPENAMES | |
| - | #define _(Text) Text |
| - | |
| #define BLKRRPART _IO(0x12,95) /* re-read partition table */ | |
| #define BLKGETSIZE _IO(0x12,96) /* return device size */ | |
| #define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ | |
util-linux/nfsmount.c+1 -3
| @@ -53,7 +53,7 @@ | |
| #include "nfsmount.h" | |
| /* This is just a warning of a common mistake. Possibly this should be a | |
| - | * * uclibc faq entry rather than in busybox... */ |
| + | * uclibc faq entry rather than in busybox... */ |
| #if ENABLE_FEATURE_MOUNT_NFS && defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__) | |
| #error "You need to build uClibc with UCLIBC_HAS_RPC for NFS support." | |
| #endif | |
| @@ -118,8 +118,6 @@ static const int NFS_PORT = 2049; | |
| # define bindtextdomain(Domain, Directory) /* empty */ | |
| # undef textdomain | |
| # define textdomain(Domain) /* empty */ | |
| - | # define _(Text) (Text) |
| - | # define N_(Text) (Text) |
| static const int MS_MGC_VAL = 0xc0ed0000; /* Magic number indicatng "new" flags */ | |
| static const int MS_RDONLY = 1; /* Mount read-only */ | |