mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/nsf/: Unbreak compilation by disabling memguard and doing some dirty hack fixes to make it compile on 64bits.

Browse source 
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.
This commit is contained in:
Wim Taymans 2008-03-25 16:58:53 +00:00
parent a4d0dacec2
commit 6763549151
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 2008-03-25 Sebastian Dröge <slomo@circular-chaos.org>
Patch by: Andreas Henriksson <andreas at fatal dot set> Patch by: Andreas Henriksson <andreas at fatal dot set>

11
gst/nsf/memguard.c
View file

@ -270,7 +270,8 @@ _my_free (void **data)
char fail[256]; char fail[256];
if (NULL == data || NULL == *data if (NULL == data || NULL == *data
|| 0xFFFFFFFF == (uint32) * data || 0xFFFFFFFF == (uint32) data) { || (void *) 0xFFFFFFFF == (void *) *data
|| (void *) 0xFFFFFFFF == (void *) data) {
#ifdef NOFRENDO_DEBUG #ifdef NOFRENDO_DEBUG
sprintf (fail, "free: attempted to free NULL pointer at line %d of %s\n", sprintf (fail, "free: attempted to free NULL pointer at line %d of %s\n",
line, file); line, file);
@ -354,7 +355,13 @@ mem_checkblocks (void)
/* /*
** $Log$ ** $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> ** Patch by: Andreas Henriksson <andreas at fatal dot set>
** * gst/nsf/Makefile.am: ** * gst/nsf/Makefile.am:
** * gst/nsf/dis6502.h: ** * gst/nsf/dis6502.h:

10
gst/nsf/types.h
View file

@ -90,7 +90,7 @@ typedef uint8 boolean;
exit(1);\ exit(1);\
} }
#else /* Not debugging */ #else /* Not debugging */
#include "memguard.h" #include <stdlib.h>
#define ASSERT(expr) #define ASSERT(expr)
#define ASSERT_MSG(msg) #define ASSERT_MSG(msg)
#endif #endif
@ -99,7 +99,13 @@ typedef uint8 boolean;
/* /*
** $Log$ ** $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> ** Patch by: Andreas Henriksson <andreas at fatal dot set>
** * gst/nsf/Makefile.am: ** * gst/nsf/Makefile.am:
** * gst/nsf/dis6502.h: ** * gst/nsf/dis6502.h: