diff options
| author | Tomas Bzatek <tbzatek@redhat.com> | 2012-02-03 15:37:06 +0100 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2012-02-03 15:37:06 +0100 |
| commit | f4d8292cf67ab481a27ea88f04e2edd6dc16119e (patch) | |
| tree | 218e5a6a4d8a9048b075b6b5bb3caaf249e0465a /zip/ZipArchive | |
| parent | e932ebbf029a4cdb38c61a838e8f3669debd410e (diff) | |
| download | tuxcmd-modules-f4d8292cf67ab481a27ea88f04e2edd6dc16119e.tar.xz | |
ZipArchive: More complete fix for gcc-4.7
Reverting the #ifdef changes I did last time and adding an include
should do the trick. More testing on older platforms is needed though.
Diffstat (limited to 'zip/ZipArchive')
| -rw-r--r-- | zip/ZipArchive/stdafx.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/zip/ZipArchive/stdafx.h b/zip/ZipArchive/stdafx.h index db54a41..ddb2fd4 100644 --- a/zip/ZipArchive/stdafx.h +++ b/zip/ZipArchive/stdafx.h @@ -23,6 +23,7 @@ #include "_features.h"
#include "_platform.h"
+#include <unistd.h>
#if _MSC_VER > 1000
#pragma once
@@ -67,7 +68,7 @@ #define ZIP_SIZE_TYPE DWORD
#define ZIP_ZLIB_TYPE int
-#if !defined(_INTPTR_T_DEFINED)
+#if !defined(_INTPTR_T_DEFINED) && !defined(__GNUC__)
#if defined (__BORLANDC__)
#include <stdint.h>
#elif _MSC_VER <= 1200 || !defined _MSC_VER
|