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

[landley at busybox.net]

Author: landley
Date: 2006-05-28 22:00:44 -0700 (Sun, 28 May 2006)
New Revision: 15212

Log:
Remove _() and N_() from platform.h.  #define them as NOP macros in the two
files still using them.  I didn't remove them from e2fsck.c to avoid stomping
pending cleanup patches from Garrett, and I didn't bother to remove them from
fdisk.c because that entire file needs to be rewritten from scratch.


Modified:
   trunk/busybox/e2fsprogs/e2fsck.c
   trunk/busybox/include/platform.h
   trunk/busybox/util-linux/fdisk.c


Changeset:
Modified: trunk/busybox/e2fsprogs/e2fsck.c
===================================================================
--- trunk/busybox/e2fsprogs/e2fsck.c	2006-05-29 04:49:55 UTC (rev 15211)
+++ trunk/busybox/e2fsprogs/e2fsck.c	2006-05-29 05:00:44 UTC (rev 15212)
@@ -39,6 +39,9 @@
 
 #include "e2fsck.h"	/*Put all of our defines here to clean things up*/
 
+#define _(x) x
+#define N_(x) x
+
 /*
  * Procedure declarations
  */

Modified: trunk/busybox/include/platform.h
===================================================================
--- trunk/busybox/include/platform.h	2006-05-29 04:49:55 UTC (rev 15211)
+++ trunk/busybox/include/platform.h	2006-05-29 05:00:44 UTC (rev 15212)
@@ -97,18 +97,16 @@
 #endif
 
 /* ---- Endian Detection ------------------------------------ */
-#if !defined __APPLE__ && !(defined __digital__ && defined __unix__)
-# include <byteswap.h>
-# include <endian.h>
-#endif
 
 #if (defined __digital__ && defined __unix__)
 # include <sex.h>
 # define __BIG_ENDIAN__ (BYTE_ORDER == BIG_ENDIAN)
 # define __BYTE_ORDER BYTE_ORDER
+#elif !defined __APPLE__
+# include <byteswap.h>
+# include <endian.h>
 #endif
 
-
 #ifdef __BIG_ENDIAN__
 # define BB_BIG_ENDIAN 1
 # define BB_LITTLE_ENDIAN 0
@@ -188,13 +186,7 @@
 #define PRIu32 "u"
 #endif
 
-
-/* NLS stuff */
-/* THIS SHOULD BE CLEANED OUT OF THE TREE ENTIRELY */
-#define _(Text) Text
-#define N_(Text) (Text)
-
-/* THIS SHOULD BE CLEANED OUT OF THE TREE ENTIRELY */
+// Need to implement fdprintf for platforms that haven't got dprintf.
 #define fdprintf dprintf
 
 /* THIS SHOULD BE CLEANED OUT OF THE TREE ENTIRELY */

Modified: trunk/busybox/util-linux/fdisk.c
===================================================================
--- trunk/busybox/util-linux/fdisk.c	2006-05-29 04:49:55 UTC (rev 15211)
+++ trunk/busybox/util-linux/fdisk.c	2006-05-29 05:00:44 UTC (rev 15212)
@@ -10,6 +10,8 @@
 #define UTIL_LINUX_VERSION "2.12"
 
 
+#define _(x) x
+
 #define PROC_PARTITIONS "/proc/partitions"
 
 #include <features.h>