summaryrefslogtreecommitdiffstats
path: root/cpukit/zlib
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2011-03-18 10:11:39 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2011-03-18 10:11:39 +0000
commit8b631ccdc35f14c808e89f4bdc68c712d81ade62 (patch)
treeb94251552d993bb42d31df954162dfca730dcd78 /cpukit/zlib
parent28947389ae968e2dd9a3d2039dd66004027852a1 (diff)
downloadrtems-8b631ccdc35f14c808e89f4bdc68c712d81ade62.tar.bz2
2010-03-28 Joel Sherrill <joel.sherrill@oarcorp.com>
* zconf.h: Add include of config.h
Diffstat (limited to 'cpukit/zlib')
-rw-r--r--cpukit/zlib/ChangeLog4
-rw-r--r--cpukit/zlib/zconf.h9
2 files changed, 4 insertions, 9 deletions
diff --git a/cpukit/zlib/ChangeLog b/cpukit/zlib/ChangeLog
index e602746373..7c36ae4b4d 100644
--- a/cpukit/zlib/ChangeLog
+++ b/cpukit/zlib/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-28 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * zconf.h: Add include of config.h
+
2010-03-26 Thomas Doerfler <Thomas.Doerfler@embeded-brains.de>
* zlib.h, zutil.c, zutil.h, gzlib.c, crc32.c, adler32.c:
diff --git a/cpukit/zlib/zconf.h b/cpukit/zlib/zconf.h
index 76be7915e6..58880245c1 100644
--- a/cpukit/zlib/zconf.h
+++ b/cpukit/zlib/zconf.h
@@ -333,20 +333,11 @@
# define FAR
#endif
-#if defined(__rtems__)
-#include <stdint.h>
-
-typedef uint_least8_t Byte;
-typedef uint_least16_t uInt;
-typedef uint_least32_t uLong;
-
-#else
#if !defined(__MACTYPES__)
typedef unsigned char Byte; /* 8 bits */
#endif
typedef unsigned int uInt; /* 16 bits or more */
typedef unsigned long uLong; /* 32 bits or more */
-#endif
#ifdef SMALL_MEDIUM
/* Borland C/C++ and some old MSC versions ignore FAR inside typedef */