diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-04-05 22:17:02 +0200 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-04-20 19:14:26 +0200 |
| commit | 949d257fa1cd9928b9717e06b299af8e1b03fd7e (patch) | |
| tree | 66cd10a1d5a0abeec40045c7bbe0e0057ca04a42 | |
| parent | 6d38bf593dae82da251514ac948c2d2381f0c6de (diff) | |
| download | busybox-w32-949d257fa1cd9928b9717e06b299af8e1b03fd7e.tar.gz busybox-w32-949d257fa1cd9928b9717e06b299af8e1b03fd7e.tar.bz2 busybox-w32-949d257fa1cd9928b9717e06b299af8e1b03fd7e.zip | |
win32: od_bloaty: rename some symbols due to conflict on Windows
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
| -rw-r--r-- | coreutils/od_bloaty.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c index 6a532fa9d..7b1ab8981 100644 --- a/coreutils/od_bloaty.c +++ b/coreutils/od_bloaty.c | |||
| @@ -84,6 +84,13 @@ typedef long long llong; | |||
| 84 | # define LDBL_DIG DBL_DIG | 84 | # define LDBL_DIG DBL_DIG |
| 85 | #endif | 85 | #endif |
| 86 | 86 | ||
| 87 | #ifdef __MINGW32__ | ||
| 88 | /* symbol conflict */ | ||
| 89 | #define CHAR SIZE_CHAR | ||
| 90 | #define SHORT SIZE_SHORT | ||
| 91 | #define LONG SIZE_LONG | ||
| 92 | #define INT SIZE_INT | ||
| 93 | #endif | ||
| 87 | enum size_spec { | 94 | enum size_spec { |
| 88 | NO_SIZE, | 95 | NO_SIZE, |
| 89 | CHAR, | 96 | CHAR, |