diff options
| author | Rocky Bernstein <rockyb@users.sourceforge.net> | 2004-02-19 02:50:24 +0000 |
|---|---|---|
| committer | Rocky Bernstein <rockyb@users.sourceforge.net> | 2004-02-19 02:50:24 +0000 |
| commit | 5cb036aff44c2ff274ec38b28382245c5f695689 (patch) | |
| tree | b55f5f42c0cf359faddca2c2724bd41e626f8cdf /src/libxineadec | |
| parent | 8aec8d2b5344d4f748755cfb328fd811a8bfc526 (diff) | |
| download | xine-lib-5cb036aff44c2ff274ec38b28382245c5f695689.tar.gz xine-lib-5cb036aff44c2ff274ec38b28382245c5f695689.tar.bz2 | |
Mandrake patches from
http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/SPECS/xine-lib/
via Goetz Waschk who reports:
The amd64 patch (xine-lib-1-rc0a-amd64.patch) sets some conservative
CFLAGS for amd64,
the lib64 patch (xine-lib-1-rc0a-lib64.patch) replaces hardcoded
/lib to support the lib64 library dir on amd64,
the directfb patch (xine-lib-1-rc2-no-directfb.patch) adds a
configure option to disable directfb,
the linuxfb patch (xine-lib-1-rc3a-no-linuxfb.patch) does the same
for linux framebuffer and
the 64bit fixes patch (xine-lib-1-rc3-64bit-fixes.patch) doesn't
apply at the moment against the CVS -- demux_ogg.c was not applied.
it includes some 64 bit pointer and other fixes for 64bit architectures.
from Gwenole Beauchesne
I haven't tested other than apply and compile.
CVS patchset: 6174
CVS date: 2004/02/19 02:50:24
Diffstat (limited to 'src/libxineadec')
| -rw-r--r-- | src/libxineadec/nosefart/memguard.c | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/src/libxineadec/nosefart/memguard.c b/src/libxineadec/nosefart/memguard.c index 05d0cb91d..2b29b7d0c 100644 --- a/src/libxineadec/nosefart/memguard.c +++ b/src/libxineadec/nosefart/memguard.c @@ -22,7 +22,7 @@ ** memory allocation wrapper routines ** ** NOTE: based on code (c) 1998 the Retrocade group -** $Id: memguard.c,v 1.2 2003/12/05 15:55:01 f1rmb Exp $ +** $Id: memguard.c,v 1.3 2004/02/19 02:50:25 rockyb Exp $ */ #include "types.h" @@ -33,6 +33,7 @@ #include <string.h> #include <stdlib.h> +#include <stdint.h> #include "memguard.h" #include "log.h" @@ -271,7 +272,7 @@ void _my_free(void **data) char fail[256]; if (NULL == data || NULL == *data - || 0xFFFFFFFF == (uint32) *data || 0xFFFFFFFF == (uint32) data) + || ((uintptr_t)-1) == (uintptr_t) *data || ((uintptr_t)-1) == (uintptr_t) data) { #ifdef NOFRENDO_DEBUG sprintf(fail, "free: attempted to free NULL pointer at line %d of %s\n", @@ -363,6 +364,30 @@ void mem_checkblocks(void) /* ** $Log: memguard.c,v $ +** Revision 1.3 2004/02/19 02:50:25 rockyb +** Mandrake patches from +** http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/SPECS/xine-lib/ +** via Goetz Waschk who reports: +** +** The amd64 patch (xine-lib-1-rc0a-amd64.patch) sets some conservative +** CFLAGS for amd64, +** +** the lib64 patch (xine-lib-1-rc0a-lib64.patch) replaces hardcoded +** /lib to support the lib64 library dir on amd64, +** +** the directfb patch (xine-lib-1-rc2-no-directfb.patch) adds a +** configure option to disable directfb, +** +** the linuxfb patch (xine-lib-1-rc3a-no-linuxfb.patch) does the same +** for linux framebuffer and +** +** the 64bit fixes patch (xine-lib-1-rc3-64bit-fixes.patch) doesn't +** apply at the moment against the CVS -- demux_ogg.c was not applied. +** it includes some 64 bit pointer and other fixes for 64bit architectures. +** from Gwenole Beauchesne +** +** I haven't tested other than apply and compile. +** ** Revision 1.2 2003/12/05 15:55:01 f1rmb ** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued... ** |