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/platform.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/platform.h')
-rw-r--r-- | include/platform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/platform.h b/include/platform.h index 3400fdfd5..04fee8d03 100644 --- a/include/platform.h +++ b/include/platform.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 5 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
6 | */ | 6 | */ |
7 | #ifndef BB_PLATFORM_H | 7 | #ifndef BB_PLATFORM_H |
8 | #define BB_PLATFORM_H 1 | 8 | #define BB_PLATFORM_H 1 |
9 | 9 | ||
10 | #if ENABLE_PLATFORM_MINGW32 | 10 | #if ENABLE_PLATFORM_MINGW32 |