gst/nsf/: Update our internal nosefart to nosefart-2.7-mls to fix segfaults on some files. Fixes bug #498237.

Original commit message from CVS:
Patch by: Andreas Henriksson <andreas at fatal dot set>
* gst/nsf/Makefile.am:
* gst/nsf/dis6502.h:
* gst/nsf/fds_snd.c:
* gst/nsf/fds_snd.h:
* gst/nsf/fmopl.c:
* gst/nsf/fmopl.h:
* gst/nsf/gstnsf.c:
* gst/nsf/log.c:
* gst/nsf/log.h:
* gst/nsf/memguard.c:
* gst/nsf/memguard.h:
* gst/nsf/mmc5_snd.c:
* gst/nsf/mmc5_snd.h:
* gst/nsf/nes6502.c:
* gst/nsf/nes6502.h:
* gst/nsf/nes_apu.c:
* gst/nsf/nes_apu.h:
* gst/nsf/nsf.c:
* gst/nsf/nsf.h:
* gst/nsf/osd.h:
* gst/nsf/types.h:
* gst/nsf/vrc7_snd.c:
* gst/nsf/vrc7_snd.h:
* gst/nsf/vrcvisnd.c:
* gst/nsf/vrcvisnd.h:
Update our internal nosefart to nosefart-2.7-mls to fix segfaults
on some files. Fixes bug #498237.
Remove some // comments, fix some compiler warnings and use pow()
instead of a slow, selfmade implementation.

1 files changed, 37 insertions, 37 deletions

diff --git a/gst/nsf/types.h b/gst/nsf/types.h
index 8ba17e91..98794903 100644
--- a/gst/nsf/types.h
+++ b/gst/nsf/types.h
@@ -23,16 +23,13 @@
 ** $Id$
 */
 
-#ifndef _NSF_TYPES_H_
-#define _NSF_TYPES_H_
+#ifndef _TYPES_H_
+#define _TYPES_H_
 
-#include <glib.h> /* for types, endianness */
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
 /* Define this if running on little-endian (x86) systems */
-#define  HOST_LITTLE_ENDIAN
-#else
-#undef  HOST_LITTLE_ENDIAN
+
+#ifndef DCPLAYA
+# define  HOST_LITTLE_ENDIAN
 #endif
 
 #ifdef __GNUC__
@@ -43,15 +40,28 @@
 #define  INLINE      static
 #endif
 
-typedef  gint8     int8;
-typedef  gint16    int16;
-typedef  gint32    int32;
+/* These should be changed depending on the platform */
+
+
 
-typedef  guint8    uint8;
-typedef  guint16   uint16;
-typedef  guint32   uint32;
+#ifdef __BEOS__		/* added by Eli Dayan (for compiling under BeOS) */
+	
+	/* use types in the BeOS Support Kit instead */
+	#include <be/support/SupportDefs.h>
+#elif defined (DCPLAYA) /* $$$ added by ben (for compiling with dcplaya) */
+# include <arch/types.h>
+#else	
+	typedef  char     int8;
+	typedef  short    int16;
+	typedef  int      int32;
 
-typedef  guint8    boolean;
+	typedef  unsigned char  uint8;
+	typedef  unsigned short uint16;
+	typedef  unsigned int   uint32;
+
+#endif
+
+typedef  uint8    boolean;
 
 #ifndef  TRUE
 #define  TRUE     1
@@ -66,6 +76,7 @@ typedef  guint8    boolean;
 
 #ifdef NOFRENDO_DEBUG
 #include <stdlib.h>
+#include "memguard.h"
 #include "log.h"
 #define  ASSERT(expr)      if (FALSE == (expr))\
                            {\
@@ -79,33 +90,17 @@ typedef  guint8    boolean;
                              exit(1);\
                            }
 #else /* Not debugging */
-#include <stdlib.h>
+#include "memguard.h"
 #define  ASSERT(expr)
 #define  ASSERT_MSG(msg)
 #endif
 
-#endif /* _NSF_TYPES_H_ */
+#endif /* _TYPES_H_ */
 
 /*
 ** $Log$
-** Revision 1.3  2007/04/17 08:48:34  tpm
-** * gst/nsf/types.h:
-** Rename #ifndef header guard symbol to something less generic, so
-** types.h doesn't get skipped over when compiling on MingW. Include
-** GLib headers and use those to set the endianness and the basic
-** types so that this isn't entirely broken for non-x86 architectures.
-**
-** Revision 1.2  2006/07/14 09:11:11  wtay
-** * gst/nsf/Makefile.am:
-** * gst/nsf/memguard.c:
-** * gst/nsf/memguard.h:
-** * gst/nsf/types.h:
-** Remove crack malloc/free replacement.
-**
-** Revision 1.1  2006/07/13 15:07:28  wtay
-** Based on patches by: Johan Dahlin <johan at gnome dot org>
-** Ronald Bultje <rbultje at ronald dot bitfreak dot net>
-** * configure.ac:
+** 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:
 ** * gst/nsf/fds_snd.c:
@@ -113,7 +108,6 @@ typedef  guint8    boolean;
 ** * gst/nsf/fmopl.c:
 ** * gst/nsf/fmopl.h:
 ** * gst/nsf/gstnsf.c:
-** * gst/nsf/gstnsf.h:
 ** * gst/nsf/log.c:
 ** * gst/nsf/log.h:
 ** * gst/nsf/memguard.c:
@@ -132,7 +126,13 @@ typedef  guint8    boolean;
 ** * gst/nsf/vrc7_snd.h:
 ** * gst/nsf/vrcvisnd.c:
 ** * gst/nsf/vrcvisnd.h:
-** Added NSF decoder plugin. Fixes 151192.
+** Update our internal nosefart to nosefart-2.7-mls to fix segfaults
+** on some files. Fixes bug #498237.
+** Remove some // comments, fix some compiler warnings and use pow()
+** instead of a slow, selfmade implementation.
+**
+** Revision 1.1  2003/04/08 20:46:46  ben
+** add new input for NES music file.
 **
 ** Revision 1.7  2000/07/04 04:46:44  matt
 ** moved INLINE define from osd.h