mirror of
https://github.com/sheumann/hush.git
synced 2024-08-21 11:28:57 +00:00
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.
This commit is contained in:
parent
8394729ddf
commit
15d20a03d6
@ -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
|
||||
*/
|
||||
|
@ -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 */
|
||||
|
@ -10,6 +10,8 @@
|
||||
#define UTIL_LINUX_VERSION "2.12"
|
||||
|
||||
|
||||
#define _(x) x
|
||||
|
||||
#define PROC_PARTITIONS "/proc/partitions"
|
||||
|
||||
#include <features.h>
|
||||
|
Loading…
Reference in New Issue
Block a user