[vlc-devel] commit: Win64: more work from iconv from NightStrike (Jean-Baptiste Kempf )

[xxcv]

git version control wrote:
> vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Sep  3 00:03:22 2009 +0200| [1d8bae2a413bb800700644569679dd832be1060b] | committer: Jean-Baptiste Kempf 
>
> Win64: more work from iconv from NightStrike
>   
FOR THE N-TH TIME STOP CLAIMING OTHER PEOPLE'S WORK IN YOUR OWN NAME!
>   
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1d8bae2a413bb800700644569679dd832be1060b
>>     
> ---
>
>  extras/contrib/src/Patches/libiconv-win64.patch |   29 +++++++++++++++++++++++
>  1 files changed, 29 insertions(+), 0 deletions(-)
>
> diff --git a/extras/contrib/src/Patches/libiconv-win64.patch b/extras/contrib/src/Patches/libiconv-win64.patch
> index 9257972..24c55da 100644
> --- a/extras/contrib/src/Patches/libiconv-win64.patch
> +++ b/extras/contrib/src/Patches/libiconv-win64.patch
> @@ -1249,3 +1249,32 @@ diff -ruN libiconv/lib/iconv.c libiconv.new/lib/iconv.c
>   #include "aliases2.h"
>   #undef S
>   };
> +--- libiconv/srclib/malloca.c	2009-06-21 13:31:08.000000000 +0200
> ++++ libiconv.new/srclib/malloca.c	2009-09-03 00:02:20.000000000 +0200
> +@@ -75,7 +75,7 @@
> + 
> +       if (p != NULL)
> + 	{
> +-	  size_t slot;
> ++	  uintptr_t slot;
> + 
> + 	  p += HEADER_SIZE;
> + 
> +@@ -83,7 +83,7 @@
> + 	  ((int *) p)[-1] = MAGIC_NUMBER;
> + 
> + 	  /* Enter p into the hash table.  */
> +-	  slot = (unsigned long) p % HASH_TABLE_SIZE;
> ++	  slot = (uintptr_t) p % HASH_TABLE_SIZE;
> + 	  ((struct header *) (p - HEADER_SIZE))->next = mmalloca_results[slot];
> + 	  mmalloca_results[slot] = p;
> + 
> +@@ -116,7 +116,7 @@
> + 	{
> + 	  /* Looks like a mmalloca() result.  To see whether it really is one,
> + 	     perform a lookup in the hash table.  */
> +-	  size_t slot = (unsigned long) p % HASH_TABLE_SIZE;
> ++	  uintptr_t slot = (uintptr_t) p % HASH_TABLE_SIZE;
> + 	  void **chain = &mmalloca_results[slot];
> + 	  for (; *chain != NULL;)
> + 	    {
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> http://mailman.videolan.org/listinfo/vlc-devel
>
>   

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20090903/ee4e676d/attachment.html>