diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2008-03-25 16:58:53 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2008-03-25 16:58:53 +0000 |
| commit | 6763549151b4311c933a2751346fe37b41acf5ba (patch) | |
| tree | eec9365a08149dbe3249dbc98de18975140ffc29 | |
| parent | a4d0dacec222cbeb9853b56f4900f5881d67b99b (diff) | |
gst/nsf/: Unbreak compilation by disabling memguard and doing some dirty hack fixes to make it compile on 64bits.
Original commit message from CVS:
* gst/nsf/memguard.c: (_my_free):
* gst/nsf/types.h:
Unbreak compilation by disabling memguard and doing some dirty hack
fixes to make it compile on 64bits.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/nsf/memguard.c | 11 | ||||
| -rw-r--r-- | gst/nsf/types.h | 10 |
3 files changed, 24 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2008-03-25 Wim Taymans <wim.taymans@collabora.co.uk> + + * gst/nsf/memguard.c: (_my_free): + * gst/nsf/types.h: + Unbreak compilation by disabling memguard and doing some dirty hack + fixes to make it compile on 64bits. + 2008-03-25 Sebastian Dröge <slomo@circular-chaos.org> Patch by: Andreas Henriksson <andreas at fatal dot set> diff --git a/gst/nsf/memguard.c b/gst/nsf/memguard.c index 77774a7fb..10897d597 100644 --- a/gst/nsf/memguard.c +++ b/gst/nsf/memguard.c @@ -270,7 +270,8 @@ _my_free (void **data) char fail[256]; if (NULL == data || NULL == *data - || 0xFFFFFFFF == (uint32) * data || 0xFFFFFFFF == (uint32) data) { + || (void *) 0xFFFFFFFF == (void *) *data + || (void *) 0xFFFFFFFF == (void *) data) { #ifdef NOFRENDO_DEBUG sprintf (fail, "free: attempted to free NULL pointer at line %d of %s\n", line, file); @@ -354,7 +355,13 @@ mem_checkblocks (void) /* ** $Log$ -** Revision 1.3 2008/03/25 15:56:11 slomo +** Revision 1.4 2008/03/25 16:58:53 wtay +** * gst/nsf/memguard.c: (_my_free): +** * gst/nsf/types.h: +** Unbreak compilation by disabling memguard and doing some dirty hack +** fixes to make it compile on 64bits. +** +** Revision 1.3 2008-03-25 15:56:11 slomo ** Patch by: Andreas Henriksson <andreas at fatal dot set> ** * gst/nsf/Makefile.am: ** * gst/nsf/dis6502.h: diff --git a/gst/nsf/types.h b/gst/nsf/types.h index 987949032..0355bf4d7 100644 --- a/gst/nsf/types.h +++ b/gst/nsf/types.h @@ -90,7 +90,7 @@ typedef uint8 boolean; exit(1);\ } #else /* Not debugging */ -#include "memguard.h" +#include <stdlib.h> #define ASSERT(expr) #define ASSERT_MSG(msg) #endif @@ -99,7 +99,13 @@ typedef uint8 boolean; /* ** $Log$ -** Revision 1.4 2008/03/25 15:56:12 slomo +** Revision 1.5 2008/03/25 16:58:53 wtay +** * gst/nsf/memguard.c: (_my_free): +** * gst/nsf/types.h: +** Unbreak compilation by disabling memguard and doing some dirty hack +** fixes to make it compile on 64bits. +** +** Revision 1.4 2008-03-25 15:56:12 slomo ** Patch by: Andreas Henriksson <andreas at fatal dot set> ** * gst/nsf/Makefile.am: ** * gst/nsf/dis6502.h: |