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-09-10 19:49:31 +1000 |
| commit | dba27087479da352159345b6af973308c337369e (patch) | |
| tree | 5806b4ca7d01c675897f73918c9eaa938942498f | |
| parent | 0f02032c5da392f8868a6c91f3023a715a3a6ff8 (diff) | |
| download | busybox-w32-dba27087479da352159345b6af973308c337369e.tar.gz busybox-w32-dba27087479da352159345b6af973308c337369e.tar.bz2 busybox-w32-dba27087479da352159345b6af973308c337369e.zip | |
win32: od_bloaty: rename some symbols due to conflict on Windows
| -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, |