diff options
| author | Steve Kondik <shade@chemlab.org> | 2011-09-29 16:19:43 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2011-09-29 16:19:43 -0700 |
| commit | 895c9616049cd6a0922ce8afb961ae284593d0bb (patch) | |
| tree | 62810e29193f5c7c975267367953fab96a4dbea7 /libdex | |
| parent | c80ed899b50fab9c0bc6eeb69e30d3eb15945b35 (diff) | |
| parent | d0d351b2ef726ff1b76a3efb4aad91e4d1436f6a (diff) | |
| download | android_dalvik-gingerbread-release.tar.gz android_dalvik-gingerbread-release.tar.bz2 android_dalvik-gingerbread-release.zip | |
Merge branch 'gingerbread' of git://git.omapzoom.org/platform/dalvik into 237cm-7.1.0gingerbread-release
Diffstat (limited to 'libdex')
| -rw-r--r-- | libdex/CmdUtils.c | 5 | ||||
| -rw-r--r-- | libdex/ZipArchive.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libdex/CmdUtils.c b/libdex/CmdUtils.c index 35696f94f..e8fc635f9 100644 --- a/libdex/CmdUtils.c +++ b/libdex/CmdUtils.c @@ -160,7 +160,10 @@ UnzipToFileResult dexOpenAndMap(const char* fileName, const char* tempFileName, /* * Pop open the (presumed) DEX file. */ - fd = open(fileName, O_RDONLY); +#ifndef O_BINARY +#define O_BINARY 0 +#endif + fd = open(fileName, O_RDONLY | O_BINARY); if (fd < 0) { if (!quiet) { fprintf(stderr, "ERROR: unable to open '%s': %s\n", diff --git a/libdex/ZipArchive.c b/libdex/ZipArchive.c index 756f4883d..7feb417b8 100644 --- a/libdex/ZipArchive.c +++ b/libdex/ZipArchive.c @@ -341,7 +341,10 @@ int dexZipOpenArchive(const char* fileName, ZipArchive* pArchive) memset(pArchive, 0, sizeof(ZipArchive)); - fd = open(fileName, O_RDONLY, 0); +#ifndef O_BINARY +#define O_BINARY 0 +#endif + fd = open(fileName, O_RDONLY | O_BINARY, 0); if (fd < 0) { err = errno ? errno : -1; LOGV("Unable to open '%s': %s\n", fileName, strerror(err)); |