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.

3 files changed, 9 insertions, 12 deletions

diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c
index 6f3fd7eda..ceafaea4b 100644
--- a/e2fsprogs/e2fsck.c
+++ b/e2fsprogs/e2fsck.c
@@ -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
  */
diff --git a/include/platform.h b/include/platform.h
index b77d815f8..d684c2dda 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -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 @@ typedef unsigned long long int  uintmax_t;
 #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 */
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 8ceeb4835..26ec2e363 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -10,6 +10,8 @@
 #define UTIL_LINUX_VERSION "2.12"
 
 
+#define _(x) x
+
 #define PROC_PARTITIONS "/proc/partitions"
 
 #include <features.h>