summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer2006-02-23 14:25:15 +0000
committerBernhard Reutner-Fischer2006-02-23 14:25:15 +0000
commited7bb6278da100e46f6286096b47aa0a356a76d8 (patch)
treeb2891f1dc1a868bf4eb1a0e15911dd5f50aa2e64
parent51be57e4df7d94046598fd5e0fcef67e956eec59 (diff)
downloadbusybox-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
-rw-r--r--e2fsprogs/e2fsbb.h4
-rw-r--r--include/platform.h6
-rw-r--r--networking/interface.c1
-rw-r--r--util-linux/fdisk.c2
-rw-r--r--util-linux/nfsmount.c4
5 files changed, 6 insertions, 11 deletions
diff --git a/e2fsprogs/e2fsbb.h b/e2fsprogs/e2fsbb.h
index f8ab0f4..74c4e5b 100644
--- 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 b19621a..3f4bedb 100644
--- 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 b2c746b..0c39527 100644
--- 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 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 */