summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-02-23 14:25:15 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-02-23 14:25:15 +0000
commited7bb6278da100e46f6286096b47aa0a356a76d8 (patch)
treeb2891f1dc1a868bf4eb1a0e15911dd5f50aa2e64 /util-linux
parent51be57e4df7d94046598fd5e0fcef67e956eec59 (diff)
downloadbusybox-w32-ed7bb6278da100e46f6286096b47aa0a356a76d8.tar.gz
busybox-w32-ed7bb6278da100e46f6286096b47aa0a356a76d8.tar.bz2
busybox-w32-ed7bb6278da100e46f6286096b47aa0a356a76d8.zip
- 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.c2
-rw-r--r--util-linux/nfsmount.c4
2 files changed, 1 insertions, 5 deletions
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
124static const int MS_MGC_VAL = 0xc0ed0000; /* Magic number indicatng "new" flags */ 122static const int MS_MGC_VAL = 0xc0ed0000; /* Magic number indicatng "new" flags */
125static const int MS_RDONLY = 1; /* Mount read-only */ 123static const int MS_RDONLY = 1; /* Mount read-only */