diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
| commit | 9db69882bee2d528d706d61d34ef7741122330be (patch) | |
| tree | f46c4ed5cae58956cd165e552ea4e366fd9b1a6c /include/libbb.h | |
| parent | 3f357a9c754805c4c38793749927aeda82797735 (diff) | |
| parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
| download | busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.gz busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.bz2 busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.zip | |
Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'
Conflicts:
libbb/make_directory.c
Diffstat (limited to 'include/libbb.h')
| -rw-r--r-- | include/libbb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/libbb.h b/include/libbb.h index 2936a8816..715f1e102 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -231,11 +231,11 @@ typedef unsigned long uoff_t; | |||
| 231 | 231 | ||
| 232 | /* Macros for min/max. */ | 232 | /* Macros for min/max. */ |
| 233 | #ifndef MIN | 233 | #ifndef MIN |
| 234 | #define MIN(a,b) (((a)<(b))?(a):(b)) | 234 | #define MIN(a,b) (((a)<(b))?(a):(b)) |
| 235 | #endif | 235 | #endif |
| 236 | 236 | ||
| 237 | #ifndef MAX | 237 | #ifndef MAX |
| 238 | #define MAX(a,b) (((a)>(b))?(a):(b)) | 238 | #define MAX(a,b) (((a)>(b))?(a):(b)) |
| 239 | #endif | 239 | #endif |
| 240 | 240 | ||
| 241 | /* buffer allocation schemes */ | 241 | /* buffer allocation schemes */ |