Mercurial > pidgin
changeset 31201:481da469bd3d
merge of '1ce90eeff222690b47ecfe394e118403b2782a2f'
and '54e7873c4e78229f13e9d60f11a6e65a96bbd9dd'
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Sat, 12 Feb 2011 16:22:06 +0000 |
| parents | f3baa0787399 (diff) e3535392b624 (current diff) |
| children | 1b1f9d6b25d0 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/gg/lib/libgadu.h Mon Feb 07 04:23:25 2011 +0000 +++ b/libpurple/protocols/gg/lib/libgadu.h Sat Feb 12 16:22:06 2011 +0000 @@ -117,7 +117,7 @@ typedef unsigned short uint16_t; typedef unsigned int uint32_t; -#if !defined(__CYGWIN__) && !defined(__SunOS) +#if !defined(__CYGWIN__) && !defined(__SunOS) && !defined(_INCLUDE_HPUX_SOURCE) #define __int8_t_defined typedef signed char int8_t; typedef signed short int16_t;