diff options
-rw-r--r-- | e2fsprogs/e2fsbb.h | 4 | ||||
-rw-r--r-- | include/platform.h | 6 | ||||
-rw-r--r-- | networking/interface.c | 1 | ||||
-rw-r--r-- | util-linux/fdisk.c | 2 | ||||
-rw-r--r-- | util-linux/nfsmount.c | 4 |
5 files changed, 6 insertions, 11 deletions
diff --git a/e2fsprogs/e2fsbb.h b/e2fsprogs/e2fsbb.h index f8ab0f493..74c4e5b62 100644 --- a/e2fsprogs/e2fsbb.h +++ b/e2fsprogs/e2fsbb.h | |||
@@ -26,10 +26,6 @@ typedef long errcode_t; | |||
26 | #define ERRCODE_RANGE 8 | 26 | #define ERRCODE_RANGE 8 |
27 | #define error_message(code) strerror((int) (code & ((1<<ERRCODE_RANGE)-1))) | 27 | #define error_message(code) strerror((int) (code & ((1<<ERRCODE_RANGE)-1))) |
28 | 28 | ||
29 | /* NLS crap */ | ||
30 | #define _(x) x | ||
31 | #define N_(x) x | ||
32 | |||
33 | /* misc crap */ | 29 | /* misc crap */ |
34 | #define fatal_error(err, msg) bb_error_msg_and_die(msg) | 30 | #define fatal_error(err, msg) bb_error_msg_and_die(msg) |
35 | #define usage() bb_show_usage() | 31 | #define usage() bb_show_usage() |
diff --git a/include/platform.h b/include/platform.h index b19621af1..3f4bedbe8 100644 --- a/include/platform.h +++ b/include/platform.h | |||
@@ -88,9 +88,13 @@ | |||
88 | #define BB_BIG_ENDIAN 1 | 88 | #define BB_BIG_ENDIAN 1 |
89 | #elif __BYTE_ORDER == __BIG_ENDIAN | 89 | #elif __BYTE_ORDER == __BIG_ENDIAN |
90 | #define BB_BIG_ENDIAN 1 | 90 | #define BB_BIG_ENDIAN 1 |
91 | #else | 91 | #else |
92 | #define BB_BIG_ENDIAN 0 | 92 | #define BB_BIG_ENDIAN 0 |
93 | #endif | 93 | #endif |
94 | 94 | ||
95 | /* ---- miscellaneous --------------------------------------- */ | ||
96 | /* NLS stuff */ | ||
97 | #define _(Text) Text | ||
98 | #define N_(Text) (Text) | ||
95 | 99 | ||
96 | #endif /* platform.h */ | 100 | #endif /* platform.h */ |
diff --git a/networking/interface.c b/networking/interface.c index b2c746be9..0c395272f 100644 --- a/networking/interface.c +++ b/networking/interface.c | |||
@@ -81,7 +81,6 @@ | |||
81 | # undef HAVE_AFINET6 | 81 | # undef HAVE_AFINET6 |
82 | #endif | 82 | #endif |
83 | 83 | ||
84 | #define _(x) x | ||
85 | #define _PATH_PROCNET_DEV "/proc/net/dev" | 84 | #define _PATH_PROCNET_DEV "/proc/net/dev" |
86 | #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6" | 85 | #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6" |
87 | #define new(p) ((p) = xcalloc(1,sizeof(*(p)))) | 86 | #define new(p) ((p) = xcalloc(1,sizeof(*(p)))) |
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 0514b8935..8a5340aad 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c | |||
@@ -42,8 +42,6 @@ | |||
42 | 42 | ||
43 | #define DKTYPENAMES | 43 | #define DKTYPENAMES |
44 | 44 | ||
45 | #define _(Text) Text | ||
46 | |||
47 | #define BLKRRPART _IO(0x12,95) /* re-read partition table */ | 45 | #define BLKRRPART _IO(0x12,95) /* re-read partition table */ |
48 | #define BLKGETSIZE _IO(0x12,96) /* return device size */ | 46 | #define BLKGETSIZE _IO(0x12,96) /* return device size */ |
49 | #define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ | 47 | #define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ |
diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c index e9d6dc635..a51fe817e 100644 --- a/util-linux/nfsmount.c +++ b/util-linux/nfsmount.c | |||
@@ -53,7 +53,7 @@ | |||
53 | #include "nfsmount.h" | 53 | #include "nfsmount.h" |
54 | 54 | ||
55 | /* This is just a warning of a common mistake. Possibly this should be a | 55 | /* This is just a warning of a common mistake. Possibly this should be a |
56 | * * uclibc faq entry rather than in busybox... */ | 56 | * uclibc faq entry rather than in busybox... */ |
57 | #if ENABLE_FEATURE_MOUNT_NFS && defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__) | 57 | #if ENABLE_FEATURE_MOUNT_NFS && defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__) |
58 | #error "You need to build uClibc with UCLIBC_HAS_RPC for NFS support." | 58 | #error "You need to build uClibc with UCLIBC_HAS_RPC for NFS support." |
59 | #endif | 59 | #endif |
@@ -118,8 +118,6 @@ static const int NFS_PORT = 2049; | |||
118 | # define bindtextdomain(Domain, Directory) /* empty */ | 118 | # define bindtextdomain(Domain, Directory) /* empty */ |
119 | # undef textdomain | 119 | # undef textdomain |
120 | # define textdomain(Domain) /* empty */ | 120 | # define textdomain(Domain) /* empty */ |
121 | # define _(Text) (Text) | ||
122 | # define N_(Text) (Text) | ||
123 | 121 | ||
124 | static const int MS_MGC_VAL = 0xc0ed0000; /* Magic number indicatng "new" flags */ | 122 | static const int MS_MGC_VAL = 0xc0ed0000; /* Magic number indicatng "new" flags */ |
125 | static const int MS_RDONLY = 1; /* Mount read-only */ | 123 | static const int MS_RDONLY = 1; /* Mount read-only */ |