svn commit: trunk/busybox: e2fsprogs include networking util-linux

[aldot at busybox.net]

Author: aldot
Date: 2006-02-23 06:25:15 -0800 (Thu, 23 Feb 2006)
New Revision: 14235

Log:
- 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


Modified:
   trunk/busybox/e2fsprogs/e2fsbb.h
   trunk/busybox/include/platform.h
   trunk/busybox/networking/interface.c
   trunk/busybox/util-linux/fdisk.c
   trunk/busybox/util-linux/nfsmount.c


Changeset:
Modified: trunk/busybox/e2fsprogs/e2fsbb.h
===================================================================
--- trunk/busybox/e2fsprogs/e2fsbb.h	2006-02-23 12:08:50 UTC (rev 14234)
+++ trunk/busybox/e2fsprogs/e2fsbb.h	2006-02-23 14:25:15 UTC (rev 14235)
@@ -26,10 +26,6 @@
 #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()

Modified: trunk/busybox/include/platform.h
===================================================================
--- trunk/busybox/include/platform.h	2006-02-23 12:08:50 UTC (rev 14234)
+++ trunk/busybox/include/platform.h	2006-02-23 14:25:15 UTC (rev 14235)
@@ -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	*/

Modified: trunk/busybox/networking/interface.c
===================================================================
--- trunk/busybox/networking/interface.c	2006-02-23 12:08:50 UTC (rev 14234)
+++ trunk/busybox/networking/interface.c	2006-02-23 14:25:15 UTC (rev 14235)
@@ -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))))

Modified: trunk/busybox/util-linux/fdisk.c
===================================================================
--- trunk/busybox/util-linux/fdisk.c	2006-02-23 12:08:50 UTC (rev 14234)
+++ trunk/busybox/util-linux/fdisk.c	2006-02-23 14:25:15 UTC (rev 14235)
@@ -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 */

Modified: trunk/busybox/util-linux/nfsmount.c
===================================================================
--- trunk/busybox/util-linux/nfsmount.c	2006-02-23 12:08:50 UTC (rev 14234)
+++ trunk/busybox/util-linux/nfsmount.c	2006-02-23 14:25:15 UTC (rev 14235)
@@ -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 @@
 # 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 */