diff options
| author | Bernhard Reutner-Fischer | 2006-02-23 14:25:15 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer | 2006-02-23 14:25:15 +0000 |
| commit | ed7bb6278da100e46f6286096b47aa0a356a76d8 (patch) | |
| tree | b2891f1dc1a868bf4eb1a0e15911dd5f50aa2e64 /util-linux | |
| parent | 51be57e4df7d94046598fd5e0fcef67e956eec59 (diff) | |
| download | busybox-ed7bb6278da100e46f6286096b47aa0a356a76d8.zip busybox-ed7bb6278da100e46f6286096b47aa0a356a76d8.tar.gz | |
- 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
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/fdisk.c | 2 | ||||
| -rw-r--r-- | util-linux/nfsmount.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 0514b89..8a5340a 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c @@ -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 */ diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c index e9d6dc6..a51fe81 100644 --- a/util-linux/nfsmount.c +++ b/util-linux/nfsmount.c @@ -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 */ |