- 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

diff --git a/e2fsprogs/e2fsbb.h b/e2fsprogs/e2fsbb.h
index f8ab0f4932006464fa1a14540443e6a8fe66b605..74c4e5b621be1e863f6111704fbd1cef9cabae6b 100644 (file)
--- a/e2fsprogs/e2fsbb.h
+++ b/e2fsprogs/e2fsbb.h
@@ -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()

diff --git a/include/platform.h b/include/platform.h
index b19621af1ca69944cac30260e4c471c28c7cb296..3f4bedbe8f92604cbd2ff52296cc125a02fb1675 100644 (file)
--- a/include/platform.h
+++ b/include/platform.h
@@ -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   */

diff --git a/networking/interface.c b/networking/interface.c
index b2c746be9ef5317f568049b048d47686ea6e3911..0c395272fd70baab4f197ff7a56c85ec17ab6ad0 100644 (file)
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -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))))

diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 0514b8935dc5e50be0a93ae92198a210d4d774b6..8a5340aada19f20a1b629d66cea2635659966152 100644 (file)
--- 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 e9d6dc6354309b6b84391cda61cd780ea8c04a99..a51fe817eee8895093408746a7ae7147e70846b4 100644 (file)
--- 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 */