diff -r -u '--exclude-from=/tmp/qpatch4308a' patchTemp/gnutls-3.0.17/config.h.in gnutls-3.0.17/config.h.in --- patchTemp/gnutls-3.0.17/config.h.in 2012-03-17 01:27:49 -0700 +++ gnutls-3.0.17/config.h.in 2012-03-20 18:21:41 -0700 @@ -2236,6 +2236,9 @@ /* The size of `long', as computed by sizeof. */ #undef SIZEOF_LONG +/* The size of `long long', as computed by sizeof. */ +#undef SIZEOF_LONG_LONG + /* The size of `short', as computed by sizeof. */ #undef SIZEOF_SHORT diff -r -u '--exclude-from=/tmp/qpatch4308a' patchTemp/gnutls-3.0.17/doc/examples/ex-serv-anon.c gnutls-3.0.17/doc/examples/ex-serv-anon.c --- patchTemp/gnutls-3.0.17/doc/examples/ex-serv-anon.c 2012-02-08 08:08:24 -0800 +++ gnutls-3.0.17/doc/examples/ex-serv-anon.c 2012-03-20 18:12:09 -0700 @@ -114,7 +114,7 @@ inet_ntop (AF_INET, &sa_cli.sin_addr, topbuf, sizeof (topbuf)), ntohs (sa_cli.sin_port)); - gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd); + gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) ((ptrdiff_t) sd)); do { diff -r -u '--exclude-from=/tmp/qpatch4308a' patchTemp/gnutls-3.0.17/lib/accelerated/x86/aes-x86.h gnutls-3.0.17/lib/accelerated/x86/aes-x86.h --- patchTemp/gnutls-3.0.17/lib/accelerated/x86/aes-x86.h 2012-02-18 04:51:11 -0800 +++ gnutls-3.0.17/lib/accelerated/x86/aes-x86.h 2012-03-19 16:23:36 -0700 @@ -7,7 +7,7 @@ void register_padlock_crypto(void); #define ALIGN16(x) \ - ((void *)(((unsigned long)(x)+0x0f)&~(0x0f))) + ((void *)(((ptrdiff_t)(((void *) x)-((void *) 0))+((ptrdiff_t) 0x0f))&~((ptrdiff_t) 0x0f))) #define AES_KEY_ALIGN_SIZE 4 #define AES_MAXNR 14 diff -r -u '--exclude-from=/tmp/qpatch4308a' patchTemp/gnutls-3.0.17/m4/hooks.m4 gnutls-3.0.17/m4/hooks.m4 --- patchTemp/gnutls-3.0.17/m4/hooks.m4 2012-03-17 01:26:12 -0700 +++ gnutls-3.0.17/m4/hooks.m4 2012-03-20 18:21:21 -0700 @@ -221,9 +221,14 @@ # For storing integers in pointers without warnings # http://developer.gnome.org/doc/API/2.0/glib/glib-Type-Conversion-Macros.html#desc AC_CHECK_SIZEOF(void *) + AC_CHECK_SIZEOF(long long) AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(int) case $ac_cv_sizeof_void_p in + $ac_cv_sizeof_long_long) + AC_DEFINE([GNUTLS_POINTER_TO_INT_CAST], [(long long)], + [Additional cast to bring void* to a type castable to int.]) + ;; $ac_cv_sizeof_long) AC_DEFINE([GNUTLS_POINTER_TO_INT_CAST], [(long)], [Additional cast to bring void* to a type castable to int.]) diff -r -u '--exclude-from=/tmp/qpatch4308a' patchTemp/gnutls-3.0.17/src/libopts/Makefile.am gnutls-3.0.17/src/libopts/Makefile.am --- patchTemp/gnutls-3.0.17/src/libopts/Makefile.am 2012-02-29 00:26:33 -0800 +++ gnutls-3.0.17/src/libopts/Makefile.am 2012-03-20 17:37:24 -0700 @@ -8,6 +8,7 @@ libopts_la_SOURCES = libopts.c libopts_la_CPPFLAGS = -I$(top_srcdir) libopts_la_LDFLAGS = -version-info 36:3:11 +libopts_la_LIBADD = $(LTLIBINTL) EXTRA_DIST = \ ag-char-map.h alias.c ao-strs.c \ ao-strs.h autoopts/project.h autoopts/options.h \ diff -r -u '--exclude-from=/tmp/qpatch4308a' patchTemp/gnutls-3.0.17/src/libopts/genshell.h gnutls-3.0.17/src/libopts/genshell.h --- patchTemp/gnutls-3.0.17/src/libopts/genshell.h 2012-02-29 00:26:33 -0800 +++ gnutls-3.0.17/src/libopts/genshell.h 2012-03-20 17:11:06 -0700 @@ -140,10 +140,14 @@ #if defined(ENABLE_NLS) # ifndef _ -# include +# if defined(HAVE_GETTEXT) +# include +# else +# include +# endif static inline char* aoGetsText(char const* pz) { if (pz == NULL) return NULL; - return (char*)gettext(pz); + return gettext(pz); } # define _(s) aoGetsText(s) # endif /* _() */