# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1297527726 0
# Node ID 481da469bd3d5e48a3075762a9555219a509694b
# Parent  f3baa07873992c756f2f21669b999639e232892d# Parent  e3535392b624ee8d7cef2642643484ceec29ba99
merge of '1ce90eeff222690b47ecfe394e118403b2782a2f'
     and '54e7873c4e78229f13e9d60f11a6e65a96bbd9dd'

diff -r e3535392b624 -r 481da469bd3d libpurple/protocols/gg/lib/libgadu.h
--- 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;