--- ./frontends/cli/vcddump.c	Thu Jan 30 14:40:04 2003
+++ ../vcdimager-0.7.13/./frontends/cli/vcddump.c	Fri Feb 28 16:34:06 2003
@@ -49,6 +49,11 @@
 /* Eventually move above libvcd includes but having vcdinfo including. */
 #include <libvcd/vcdinfo.h>
 
+#if defined(__sgi) && !defined(__GNUC__)
+#undef	offsetof
+#define	offsetof(s, m)	(size_t)(&(((s *)0)->m))
+#endif
+
 static const char _rcsid[] = "$Id: vcddump.c,v 1.8 2003/01/30 16:55:58 rocky Exp $";
 
 static const char DELIM[] = \
@@ -1358,16 +1363,18 @@
   }
 }
 
+/*
+ * Moved outside of main to compile without GCC or C99.
+ */
+static char *opt_arg;
+static int   terse_flag       = false;
+static int   sector_2336_flag = 0;
+static char *source_name      = NULL;
 
 int
 main (int argc, const char *argv[])
 {
-  int terse_flag       = false;
-  int sector_2336_flag = 0;
-  char *source_name    = NULL;
-
   int opt;
-  char *opt_arg;
 
   /* Command-line options */
   struct poptOption optionsTable[] = {
--- ./frontends/cli/vcd_debug.c	Fri Jan  4 15:20:29 2002
+++ ../vcdimager-0.7.13/./frontends/cli/vcd_debug.c	Fri Feb 28 16:33:44 2003
@@ -49,6 +49,11 @@
 #include <libvcd/vcd_data_structures.h>
 #include <libvcd/vcd_xa.h>
 
+#if defined(__sgi) && !defined(__GNUC__)
+#undef	offsetof
+#define	offsetof(s, m)	(size_t)(&(((s *)0)->m))
+#endif
+
 static const char _rcsid[] = "$Id: vcd_debug.c,v 1.33 2002/01/04 20:20:29 hvr Exp $";
 
 static const char DELIM[] = \
--- ./frontends/xml/vcd_xml_minfo.c	Wed Aug 29 09:21:50 2001
+++ ../vcdimager-0.7.13/./frontends/xml/vcd_xml_minfo.c	Fri Feb 28 16:31:39 2003
@@ -135,20 +135,22 @@
 #define _TAG_PRINT2(tag, tp, val) \
  { _TAG_INDENT (); fprintf (_TAG_FD, "<" tag ">" tp "</" tag ">\n", val); }
 
+/*
+ * Moved outside of main to compile without GCC or C99.
+ */
+static int   _dump_aps      = 0;
+static int   _generic_info  = 0;
+static int   _gui_flag      = 0;
+static char *_output_file   = NULL;
+static int   _progress_flag = 0;
+static int   _quiet_flag    = 0;
+static int   _relaxed_aps   = 0;
+static int   _verbose_flag  = 0;
+
 int
 main (int argc, const char *argv[])
 {
   char *_mpeg_fname = NULL;
-  int _generic_info = 0;
-  int _relaxed_aps = 0;
-  int _dump_aps = 0;
-
-  int _quiet_flag = 0;
-  int _verbose_flag = 0;
-  int _progress_flag = 0;
-  int _gui_flag = 0;
-
-  char *_output_file = 0;
 
   vcd_xml_progname = "vcdxminfo";
 
--- ./frontends/xml/vcd_xml_gen.c	Wed Aug 29 09:21:50 2001
+++ ../vcdimager-0.7.13/./frontends/xml/vcd_xml_gen.c	Fri Feb 28 16:31:39 2003
@@ -227,17 +227,23 @@
   return buf;
 }
 
+/*
+ * Moved outside of main to compile without GCC or C99.
+ */
+static int              broken_svcd_mode_flag = 0;
+static int              nopbc_flag = 0;
+static struct vcdxml_t  obj;
+static char            *type_str;
+static int              update_scan_offsets_flag = 0;
+static char            *xml_fname;
+
 int
 main (int argc, const char *argv[])
 {
-  struct vcdxml_t obj;
   int n;
   
-  char *xml_fname = strdup (DEFAULT_XML_FNAME);
-  char *type_str = strdup (DEFAULT_TYPE);
-  int broken_svcd_mode_flag = 0;
-  int update_scan_offsets_flag = 0;
-  int nopbc_flag = 0;
+  type_str = strdup (DEFAULT_TYPE);
+  xml_fname = strdup (DEFAULT_XML_FNAME);
 
   vcd_xml_progname = "vcdxgen";
 
--- ./frontends/xml/vcd_xml_rip.c	Mon Jan  6 12:19:59 2003
+++ ../vcdimager-0.7.13/./frontends/xml/vcd_xml_rip.c	Fri Feb 28 16:31:39 2003
@@ -1284,23 +1284,25 @@
 #define DEFAULT_XML_FNAME      "videocd.xml"
 #define DEFAULT_IMG_FNAME      "videocd.bin"
 
+/*
+ * Moved outside of main to compile without GCC or C99.
+ */
+static int   _gui_flag        = 0;
+static int   _progress_flag   = 0;
+static char *img_fname        = NULL;
+static int   no_ext_psd_flag  = 0;
+static int   nofile_flag      = 0;
+static int   norip_flag       = 0;
+static int   noseg_flag       = 0;
+static int   noseq_flag       = 0;
+static int   sector_2336_flag = 0;
+static char *xml_fname        = NULL;
+
 int
 main (int argc, const char *argv[])
 {
   VcdImageSource *img_src = NULL;
   struct vcdxml_t obj;
-
-  /* cl params */
-  char *xml_fname = NULL;
-  char *img_fname = NULL;
-  int norip_flag = 0;
-  int nofile_flag = 0;
-  int noseq_flag = 0;
-  int noseg_flag = 0;
-  int no_ext_psd_flag = 0;
-  int sector_2336_flag = 0;
-  int _progress_flag = 0;
-  int _gui_flag = 0;
 
   enum { 
     CL_VERSION = 1,
--- ./tests/check_bitfield.c	Wed Dec 25 10:31:32 2002
+++ ../vcdimager-0.7.13/./tests/check_bitfield.c	Fri Feb 28 16:31:39 2003
@@ -28,266 +28,272 @@
 #include <libvcd/vcd_files.h>
 #include <libvcd/vcd_files_private.h>
 
+#if defined(BITFIELD_LSBF)
+#define	INFO_SPI_CONTENTS(audio, video, item, ogt)	{ audio,video,item,ogt }
+#else
+#define	INFO_SPI_CONTENTS(audio, video, item, ogt)	{ ogt,item,video,audio }
+#endif
+
 const static struct {
   InfoSpiContents bitfield;
   uint8_t intval;
 } InfoSpiContents_table[256] = {
-  { { .audio_type = 0, .video_type = 0, .item_cont = 0, .ogt = 0 }, 0x00 },
-  { { .audio_type = 1, .video_type = 0, .item_cont = 0, .ogt = 0 }, 0x01 },
-  { { .audio_type = 2, .video_type = 0, .item_cont = 0, .ogt = 0 }, 0x02 },
-  { { .audio_type = 3, .video_type = 0, .item_cont = 0, .ogt = 0 }, 0x03 },
-  { { .audio_type = 0, .video_type = 1, .item_cont = 0, .ogt = 0 }, 0x04 },
-  { { .audio_type = 1, .video_type = 1, .item_cont = 0, .ogt = 0 }, 0x05 },
-  { { .audio_type = 2, .video_type = 1, .item_cont = 0, .ogt = 0 }, 0x06 },
-  { { .audio_type = 3, .video_type = 1, .item_cont = 0, .ogt = 0 }, 0x07 },
-  { { .audio_type = 0, .video_type = 2, .item_cont = 0, .ogt = 0 }, 0x08 },
-  { { .audio_type = 1, .video_type = 2, .item_cont = 0, .ogt = 0 }, 0x09 },
-  { { .audio_type = 2, .video_type = 2, .item_cont = 0, .ogt = 0 }, 0x0a },
-  { { .audio_type = 3, .video_type = 2, .item_cont = 0, .ogt = 0 }, 0x0b },
-  { { .audio_type = 0, .video_type = 3, .item_cont = 0, .ogt = 0 }, 0x0c },
-  { { .audio_type = 1, .video_type = 3, .item_cont = 0, .ogt = 0 }, 0x0d },
-  { { .audio_type = 2, .video_type = 3, .item_cont = 0, .ogt = 0 }, 0x0e },
-  { { .audio_type = 3, .video_type = 3, .item_cont = 0, .ogt = 0 }, 0x0f },
-  { { .audio_type = 0, .video_type = 4, .item_cont = 0, .ogt = 0 }, 0x10 },
-  { { .audio_type = 1, .video_type = 4, .item_cont = 0, .ogt = 0 }, 0x11 },
-  { { .audio_type = 2, .video_type = 4, .item_cont = 0, .ogt = 0 }, 0x12 },
-  { { .audio_type = 3, .video_type = 4, .item_cont = 0, .ogt = 0 }, 0x13 },
-  { { .audio_type = 0, .video_type = 5, .item_cont = 0, .ogt = 0 }, 0x14 },
-  { { .audio_type = 1, .video_type = 5, .item_cont = 0, .ogt = 0 }, 0x15 },
-  { { .audio_type = 2, .video_type = 5, .item_cont = 0, .ogt = 0 }, 0x16 },
-  { { .audio_type = 3, .video_type = 5, .item_cont = 0, .ogt = 0 }, 0x17 },
-  { { .audio_type = 0, .video_type = 6, .item_cont = 0, .ogt = 0 }, 0x18 },
-  { { .audio_type = 1, .video_type = 6, .item_cont = 0, .ogt = 0 }, 0x19 },
-  { { .audio_type = 2, .video_type = 6, .item_cont = 0, .ogt = 0 }, 0x1a },
-  { { .audio_type = 3, .video_type = 6, .item_cont = 0, .ogt = 0 }, 0x1b },
-  { { .audio_type = 0, .video_type = 7, .item_cont = 0, .ogt = 0 }, 0x1c },
-  { { .audio_type = 1, .video_type = 7, .item_cont = 0, .ogt = 0 }, 0x1d },
-  { { .audio_type = 2, .video_type = 7, .item_cont = 0, .ogt = 0 }, 0x1e },
-  { { .audio_type = 3, .video_type = 7, .item_cont = 0, .ogt = 0 }, 0x1f },
-  { { .audio_type = 0, .video_type = 0, .item_cont = 1, .ogt = 0 }, 0x20 },
-  { { .audio_type = 1, .video_type = 0, .item_cont = 1, .ogt = 0 }, 0x21 },
-  { { .audio_type = 2, .video_type = 0, .item_cont = 1, .ogt = 0 }, 0x22 },
-  { { .audio_type = 3, .video_type = 0, .item_cont = 1, .ogt = 0 }, 0x23 },
-  { { .audio_type = 0, .video_type = 1, .item_cont = 1, .ogt = 0 }, 0x24 },
-  { { .audio_type = 1, .video_type = 1, .item_cont = 1, .ogt = 0 }, 0x25 },
-  { { .audio_type = 2, .video_type = 1, .item_cont = 1, .ogt = 0 }, 0x26 },
-  { { .audio_type = 3, .video_type = 1, .item_cont = 1, .ogt = 0 }, 0x27 },
-  { { .audio_type = 0, .video_type = 2, .item_cont = 1, .ogt = 0 }, 0x28 },
-  { { .audio_type = 1, .video_type = 2, .item_cont = 1, .ogt = 0 }, 0x29 },
-  { { .audio_type = 2, .video_type = 2, .item_cont = 1, .ogt = 0 }, 0x2a },
-  { { .audio_type = 3, .video_type = 2, .item_cont = 1, .ogt = 0 }, 0x2b },
-  { { .audio_type = 0, .video_type = 3, .item_cont = 1, .ogt = 0 }, 0x2c },
-  { { .audio_type = 1, .video_type = 3, .item_cont = 1, .ogt = 0 }, 0x2d },
-  { { .audio_type = 2, .video_type = 3, .item_cont = 1, .ogt = 0 }, 0x2e },
-  { { .audio_type = 3, .video_type = 3, .item_cont = 1, .ogt = 0 }, 0x2f },
-  { { .audio_type = 0, .video_type = 4, .item_cont = 1, .ogt = 0 }, 0x30 },
-  { { .audio_type = 1, .video_type = 4, .item_cont = 1, .ogt = 0 }, 0x31 },
-  { { .audio_type = 2, .video_type = 4, .item_cont = 1, .ogt = 0 }, 0x32 },
-  { { .audio_type = 3, .video_type = 4, .item_cont = 1, .ogt = 0 }, 0x33 },
-  { { .audio_type = 0, .video_type = 5, .item_cont = 1, .ogt = 0 }, 0x34 },
-  { { .audio_type = 1, .video_type = 5, .item_cont = 1, .ogt = 0 }, 0x35 },
-  { { .audio_type = 2, .video_type = 5, .item_cont = 1, .ogt = 0 }, 0x36 },
-  { { .audio_type = 3, .video_type = 5, .item_cont = 1, .ogt = 0 }, 0x37 },
-  { { .audio_type = 0, .video_type = 6, .item_cont = 1, .ogt = 0 }, 0x38 },
-  { { .audio_type = 1, .video_type = 6, .item_cont = 1, .ogt = 0 }, 0x39 },
-  { { .audio_type = 2, .video_type = 6, .item_cont = 1, .ogt = 0 }, 0x3a },
-  { { .audio_type = 3, .video_type = 6, .item_cont = 1, .ogt = 0 }, 0x3b },
-  { { .audio_type = 0, .video_type = 7, .item_cont = 1, .ogt = 0 }, 0x3c },
-  { { .audio_type = 1, .video_type = 7, .item_cont = 1, .ogt = 0 }, 0x3d },
-  { { .audio_type = 2, .video_type = 7, .item_cont = 1, .ogt = 0 }, 0x3e },
-  { { .audio_type = 3, .video_type = 7, .item_cont = 1, .ogt = 0 }, 0x3f },
-  { { .audio_type = 0, .video_type = 0, .item_cont = 0, .ogt = 1 }, 0x40 },
-  { { .audio_type = 1, .video_type = 0, .item_cont = 0, .ogt = 1 }, 0x41 },
-  { { .audio_type = 2, .video_type = 0, .item_cont = 0, .ogt = 1 }, 0x42 },
-  { { .audio_type = 3, .video_type = 0, .item_cont = 0, .ogt = 1 }, 0x43 },
-  { { .audio_type = 0, .video_type = 1, .item_cont = 0, .ogt = 1 }, 0x44 },
-  { { .audio_type = 1, .video_type = 1, .item_cont = 0, .ogt = 1 }, 0x45 },
-  { { .audio_type = 2, .video_type = 1, .item_cont = 0, .ogt = 1 }, 0x46 },
-  { { .audio_type = 3, .video_type = 1, .item_cont = 0, .ogt = 1 }, 0x47 },
-  { { .audio_type = 0, .video_type = 2, .item_cont = 0, .ogt = 1 }, 0x48 },
-  { { .audio_type = 1, .video_type = 2, .item_cont = 0, .ogt = 1 }, 0x49 },
-  { { .audio_type = 2, .video_type = 2, .item_cont = 0, .ogt = 1 }, 0x4a },
-  { { .audio_type = 3, .video_type = 2, .item_cont = 0, .ogt = 1 }, 0x4b },
-  { { .audio_type = 0, .video_type = 3, .item_cont = 0, .ogt = 1 }, 0x4c },
-  { { .audio_type = 1, .video_type = 3, .item_cont = 0, .ogt = 1 }, 0x4d },
-  { { .audio_type = 2, .video_type = 3, .item_cont = 0, .ogt = 1 }, 0x4e },
-  { { .audio_type = 3, .video_type = 3, .item_cont = 0, .ogt = 1 }, 0x4f },
-  { { .audio_type = 0, .video_type = 4, .item_cont = 0, .ogt = 1 }, 0x50 },
-  { { .audio_type = 1, .video_type = 4, .item_cont = 0, .ogt = 1 }, 0x51 },
-  { { .audio_type = 2, .video_type = 4, .item_cont = 0, .ogt = 1 }, 0x52 },
-  { { .audio_type = 3, .video_type = 4, .item_cont = 0, .ogt = 1 }, 0x53 },
-  { { .audio_type = 0, .video_type = 5, .item_cont = 0, .ogt = 1 }, 0x54 },
-  { { .audio_type = 1, .video_type = 5, .item_cont = 0, .ogt = 1 }, 0x55 },
-  { { .audio_type = 2, .video_type = 5, .item_cont = 0, .ogt = 1 }, 0x56 },
-  { { .audio_type = 3, .video_type = 5, .item_cont = 0, .ogt = 1 }, 0x57 },
-  { { .audio_type = 0, .video_type = 6, .item_cont = 0, .ogt = 1 }, 0x58 },
-  { { .audio_type = 1, .video_type = 6, .item_cont = 0, .ogt = 1 }, 0x59 },
-  { { .audio_type = 2, .video_type = 6, .item_cont = 0, .ogt = 1 }, 0x5a },
-  { { .audio_type = 3, .video_type = 6, .item_cont = 0, .ogt = 1 }, 0x5b },
-  { { .audio_type = 0, .video_type = 7, .item_cont = 0, .ogt = 1 }, 0x5c },
-  { { .audio_type = 1, .video_type = 7, .item_cont = 0, .ogt = 1 }, 0x5d },
-  { { .audio_type = 2, .video_type = 7, .item_cont = 0, .ogt = 1 }, 0x5e },
-  { { .audio_type = 3, .video_type = 7, .item_cont = 0, .ogt = 1 }, 0x5f },
-  { { .audio_type = 0, .video_type = 0, .item_cont = 1, .ogt = 1 }, 0x60 },
-  { { .audio_type = 1, .video_type = 0, .item_cont = 1, .ogt = 1 }, 0x61 },
-  { { .audio_type = 2, .video_type = 0, .item_cont = 1, .ogt = 1 }, 0x62 },
-  { { .audio_type = 3, .video_type = 0, .item_cont = 1, .ogt = 1 }, 0x63 },
-  { { .audio_type = 0, .video_type = 1, .item_cont = 1, .ogt = 1 }, 0x64 },
-  { { .audio_type = 1, .video_type = 1, .item_cont = 1, .ogt = 1 }, 0x65 },
-  { { .audio_type = 2, .video_type = 1, .item_cont = 1, .ogt = 1 }, 0x66 },
-  { { .audio_type = 3, .video_type = 1, .item_cont = 1, .ogt = 1 }, 0x67 },
-  { { .audio_type = 0, .video_type = 2, .item_cont = 1, .ogt = 1 }, 0x68 },
-  { { .audio_type = 1, .video_type = 2, .item_cont = 1, .ogt = 1 }, 0x69 },
-  { { .audio_type = 2, .video_type = 2, .item_cont = 1, .ogt = 1 }, 0x6a },
-  { { .audio_type = 3, .video_type = 2, .item_cont = 1, .ogt = 1 }, 0x6b },
-  { { .audio_type = 0, .video_type = 3, .item_cont = 1, .ogt = 1 }, 0x6c },
-  { { .audio_type = 1, .video_type = 3, .item_cont = 1, .ogt = 1 }, 0x6d },
-  { { .audio_type = 2, .video_type = 3, .item_cont = 1, .ogt = 1 }, 0x6e },
-  { { .audio_type = 3, .video_type = 3, .item_cont = 1, .ogt = 1 }, 0x6f },
-  { { .audio_type = 0, .video_type = 4, .item_cont = 1, .ogt = 1 }, 0x70 },
-  { { .audio_type = 1, .video_type = 4, .item_cont = 1, .ogt = 1 }, 0x71 },
-  { { .audio_type = 2, .video_type = 4, .item_cont = 1, .ogt = 1 }, 0x72 },
-  { { .audio_type = 3, .video_type = 4, .item_cont = 1, .ogt = 1 }, 0x73 },
-  { { .audio_type = 0, .video_type = 5, .item_cont = 1, .ogt = 1 }, 0x74 },
-  { { .audio_type = 1, .video_type = 5, .item_cont = 1, .ogt = 1 }, 0x75 },
-  { { .audio_type = 2, .video_type = 5, .item_cont = 1, .ogt = 1 }, 0x76 },
-  { { .audio_type = 3, .video_type = 5, .item_cont = 1, .ogt = 1 }, 0x77 },
-  { { .audio_type = 0, .video_type = 6, .item_cont = 1, .ogt = 1 }, 0x78 },
-  { { .audio_type = 1, .video_type = 6, .item_cont = 1, .ogt = 1 }, 0x79 },
-  { { .audio_type = 2, .video_type = 6, .item_cont = 1, .ogt = 1 }, 0x7a },
-  { { .audio_type = 3, .video_type = 6, .item_cont = 1, .ogt = 1 }, 0x7b },
-  { { .audio_type = 0, .video_type = 7, .item_cont = 1, .ogt = 1 }, 0x7c },
-  { { .audio_type = 1, .video_type = 7, .item_cont = 1, .ogt = 1 }, 0x7d },
-  { { .audio_type = 2, .video_type = 7, .item_cont = 1, .ogt = 1 }, 0x7e },
-  { { .audio_type = 3, .video_type = 7, .item_cont = 1, .ogt = 1 }, 0x7f },
-  { { .audio_type = 0, .video_type = 0, .item_cont = 0, .ogt = 2 }, 0x80 },
-  { { .audio_type = 1, .video_type = 0, .item_cont = 0, .ogt = 2 }, 0x81 },
-  { { .audio_type = 2, .video_type = 0, .item_cont = 0, .ogt = 2 }, 0x82 },
-  { { .audio_type = 3, .video_type = 0, .item_cont = 0, .ogt = 2 }, 0x83 },
-  { { .audio_type = 0, .video_type = 1, .item_cont = 0, .ogt = 2 }, 0x84 },
-  { { .audio_type = 1, .video_type = 1, .item_cont = 0, .ogt = 2 }, 0x85 },
-  { { .audio_type = 2, .video_type = 1, .item_cont = 0, .ogt = 2 }, 0x86 },
-  { { .audio_type = 3, .video_type = 1, .item_cont = 0, .ogt = 2 }, 0x87 },
-  { { .audio_type = 0, .video_type = 2, .item_cont = 0, .ogt = 2 }, 0x88 },
-  { { .audio_type = 1, .video_type = 2, .item_cont = 0, .ogt = 2 }, 0x89 },
-  { { .audio_type = 2, .video_type = 2, .item_cont = 0, .ogt = 2 }, 0x8a },
-  { { .audio_type = 3, .video_type = 2, .item_cont = 0, .ogt = 2 }, 0x8b },
-  { { .audio_type = 0, .video_type = 3, .item_cont = 0, .ogt = 2 }, 0x8c },
-  { { .audio_type = 1, .video_type = 3, .item_cont = 0, .ogt = 2 }, 0x8d },
-  { { .audio_type = 2, .video_type = 3, .item_cont = 0, .ogt = 2 }, 0x8e },
-  { { .audio_type = 3, .video_type = 3, .item_cont = 0, .ogt = 2 }, 0x8f },
-  { { .audio_type = 0, .video_type = 4, .item_cont = 0, .ogt = 2 }, 0x90 },
-  { { .audio_type = 1, .video_type = 4, .item_cont = 0, .ogt = 2 }, 0x91 },
-  { { .audio_type = 2, .video_type = 4, .item_cont = 0, .ogt = 2 }, 0x92 },
-  { { .audio_type = 3, .video_type = 4, .item_cont = 0, .ogt = 2 }, 0x93 },
-  { { .audio_type = 0, .video_type = 5, .item_cont = 0, .ogt = 2 }, 0x94 },
-  { { .audio_type = 1, .video_type = 5, .item_cont = 0, .ogt = 2 }, 0x95 },
-  { { .audio_type = 2, .video_type = 5, .item_cont = 0, .ogt = 2 }, 0x96 },
-  { { .audio_type = 3, .video_type = 5, .item_cont = 0, .ogt = 2 }, 0x97 },
-  { { .audio_type = 0, .video_type = 6, .item_cont = 0, .ogt = 2 }, 0x98 },
-  { { .audio_type = 1, .video_type = 6, .item_cont = 0, .ogt = 2 }, 0x99 },
-  { { .audio_type = 2, .video_type = 6, .item_cont = 0, .ogt = 2 }, 0x9a },
-  { { .audio_type = 3, .video_type = 6, .item_cont = 0, .ogt = 2 }, 0x9b },
-  { { .audio_type = 0, .video_type = 7, .item_cont = 0, .ogt = 2 }, 0x9c },
-  { { .audio_type = 1, .video_type = 7, .item_cont = 0, .ogt = 2 }, 0x9d },
-  { { .audio_type = 2, .video_type = 7, .item_cont = 0, .ogt = 2 }, 0x9e },
-  { { .audio_type = 3, .video_type = 7, .item_cont = 0, .ogt = 2 }, 0x9f },
-  { { .audio_type = 0, .video_type = 0, .item_cont = 1, .ogt = 2 }, 0xa0 },
-  { { .audio_type = 1, .video_type = 0, .item_cont = 1, .ogt = 2 }, 0xa1 },
-  { { .audio_type = 2, .video_type = 0, .item_cont = 1, .ogt = 2 }, 0xa2 },
-  { { .audio_type = 3, .video_type = 0, .item_cont = 1, .ogt = 2 }, 0xa3 },
-  { { .audio_type = 0, .video_type = 1, .item_cont = 1, .ogt = 2 }, 0xa4 },
-  { { .audio_type = 1, .video_type = 1, .item_cont = 1, .ogt = 2 }, 0xa5 },
-  { { .audio_type = 2, .video_type = 1, .item_cont = 1, .ogt = 2 }, 0xa6 },
-  { { .audio_type = 3, .video_type = 1, .item_cont = 1, .ogt = 2 }, 0xa7 },
-  { { .audio_type = 0, .video_type = 2, .item_cont = 1, .ogt = 2 }, 0xa8 },
-  { { .audio_type = 1, .video_type = 2, .item_cont = 1, .ogt = 2 }, 0xa9 },
-  { { .audio_type = 2, .video_type = 2, .item_cont = 1, .ogt = 2 }, 0xaa },
-  { { .audio_type = 3, .video_type = 2, .item_cont = 1, .ogt = 2 }, 0xab },
-  { { .audio_type = 0, .video_type = 3, .item_cont = 1, .ogt = 2 }, 0xac },
-  { { .audio_type = 1, .video_type = 3, .item_cont = 1, .ogt = 2 }, 0xad },
-  { { .audio_type = 2, .video_type = 3, .item_cont = 1, .ogt = 2 }, 0xae },
-  { { .audio_type = 3, .video_type = 3, .item_cont = 1, .ogt = 2 }, 0xaf },
-  { { .audio_type = 0, .video_type = 4, .item_cont = 1, .ogt = 2 }, 0xb0 },
-  { { .audio_type = 1, .video_type = 4, .item_cont = 1, .ogt = 2 }, 0xb1 },
-  { { .audio_type = 2, .video_type = 4, .item_cont = 1, .ogt = 2 }, 0xb2 },
-  { { .audio_type = 3, .video_type = 4, .item_cont = 1, .ogt = 2 }, 0xb3 },
-  { { .audio_type = 0, .video_type = 5, .item_cont = 1, .ogt = 2 }, 0xb4 },
-  { { .audio_type = 1, .video_type = 5, .item_cont = 1, .ogt = 2 }, 0xb5 },
-  { { .audio_type = 2, .video_type = 5, .item_cont = 1, .ogt = 2 }, 0xb6 },
-  { { .audio_type = 3, .video_type = 5, .item_cont = 1, .ogt = 2 }, 0xb7 },
-  { { .audio_type = 0, .video_type = 6, .item_cont = 1, .ogt = 2 }, 0xb8 },
-  { { .audio_type = 1, .video_type = 6, .item_cont = 1, .ogt = 2 }, 0xb9 },
-  { { .audio_type = 2, .video_type = 6, .item_cont = 1, .ogt = 2 }, 0xba },
-  { { .audio_type = 3, .video_type = 6, .item_cont = 1, .ogt = 2 }, 0xbb },
-  { { .audio_type = 0, .video_type = 7, .item_cont = 1, .ogt = 2 }, 0xbc },
-  { { .audio_type = 1, .video_type = 7, .item_cont = 1, .ogt = 2 }, 0xbd },
-  { { .audio_type = 2, .video_type = 7, .item_cont = 1, .ogt = 2 }, 0xbe },
-  { { .audio_type = 3, .video_type = 7, .item_cont = 1, .ogt = 2 }, 0xbf },
-  { { .audio_type = 0, .video_type = 0, .item_cont = 0, .ogt = 3 }, 0xc0 },
-  { { .audio_type = 1, .video_type = 0, .item_cont = 0, .ogt = 3 }, 0xc1 },
-  { { .audio_type = 2, .video_type = 0, .item_cont = 0, .ogt = 3 }, 0xc2 },
-  { { .audio_type = 3, .video_type = 0, .item_cont = 0, .ogt = 3 }, 0xc3 },
-  { { .audio_type = 0, .video_type = 1, .item_cont = 0, .ogt = 3 }, 0xc4 },
-  { { .audio_type = 1, .video_type = 1, .item_cont = 0, .ogt = 3 }, 0xc5 },
-  { { .audio_type = 2, .video_type = 1, .item_cont = 0, .ogt = 3 }, 0xc6 },
-  { { .audio_type = 3, .video_type = 1, .item_cont = 0, .ogt = 3 }, 0xc7 },
-  { { .audio_type = 0, .video_type = 2, .item_cont = 0, .ogt = 3 }, 0xc8 },
-  { { .audio_type = 1, .video_type = 2, .item_cont = 0, .ogt = 3 }, 0xc9 },
-  { { .audio_type = 2, .video_type = 2, .item_cont = 0, .ogt = 3 }, 0xca },
-  { { .audio_type = 3, .video_type = 2, .item_cont = 0, .ogt = 3 }, 0xcb },
-  { { .audio_type = 0, .video_type = 3, .item_cont = 0, .ogt = 3 }, 0xcc },
-  { { .audio_type = 1, .video_type = 3, .item_cont = 0, .ogt = 3 }, 0xcd },
-  { { .audio_type = 2, .video_type = 3, .item_cont = 0, .ogt = 3 }, 0xce },
-  { { .audio_type = 3, .video_type = 3, .item_cont = 0, .ogt = 3 }, 0xcf },
-  { { .audio_type = 0, .video_type = 4, .item_cont = 0, .ogt = 3 }, 0xd0 },
-  { { .audio_type = 1, .video_type = 4, .item_cont = 0, .ogt = 3 }, 0xd1 },
-  { { .audio_type = 2, .video_type = 4, .item_cont = 0, .ogt = 3 }, 0xd2 },
-  { { .audio_type = 3, .video_type = 4, .item_cont = 0, .ogt = 3 }, 0xd3 },
-  { { .audio_type = 0, .video_type = 5, .item_cont = 0, .ogt = 3 }, 0xd4 },
-  { { .audio_type = 1, .video_type = 5, .item_cont = 0, .ogt = 3 }, 0xd5 },
-  { { .audio_type = 2, .video_type = 5, .item_cont = 0, .ogt = 3 }, 0xd6 },
-  { { .audio_type = 3, .video_type = 5, .item_cont = 0, .ogt = 3 }, 0xd7 },
-  { { .audio_type = 0, .video_type = 6, .item_cont = 0, .ogt = 3 }, 0xd8 },
-  { { .audio_type = 1, .video_type = 6, .item_cont = 0, .ogt = 3 }, 0xd9 },
-  { { .audio_type = 2, .video_type = 6, .item_cont = 0, .ogt = 3 }, 0xda },
-  { { .audio_type = 3, .video_type = 6, .item_cont = 0, .ogt = 3 }, 0xdb },
-  { { .audio_type = 0, .video_type = 7, .item_cont = 0, .ogt = 3 }, 0xdc },
-  { { .audio_type = 1, .video_type = 7, .item_cont = 0, .ogt = 3 }, 0xdd },
-  { { .audio_type = 2, .video_type = 7, .item_cont = 0, .ogt = 3 }, 0xde },
-  { { .audio_type = 3, .video_type = 7, .item_cont = 0, .ogt = 3 }, 0xdf },
-  { { .audio_type = 0, .video_type = 0, .item_cont = 1, .ogt = 3 }, 0xe0 },
-  { { .audio_type = 1, .video_type = 0, .item_cont = 1, .ogt = 3 }, 0xe1 },
-  { { .audio_type = 2, .video_type = 0, .item_cont = 1, .ogt = 3 }, 0xe2 },
-  { { .audio_type = 3, .video_type = 0, .item_cont = 1, .ogt = 3 }, 0xe3 },
-  { { .audio_type = 0, .video_type = 1, .item_cont = 1, .ogt = 3 }, 0xe4 },
-  { { .audio_type = 1, .video_type = 1, .item_cont = 1, .ogt = 3 }, 0xe5 },
-  { { .audio_type = 2, .video_type = 1, .item_cont = 1, .ogt = 3 }, 0xe6 },
-  { { .audio_type = 3, .video_type = 1, .item_cont = 1, .ogt = 3 }, 0xe7 },
-  { { .audio_type = 0, .video_type = 2, .item_cont = 1, .ogt = 3 }, 0xe8 },
-  { { .audio_type = 1, .video_type = 2, .item_cont = 1, .ogt = 3 }, 0xe9 },
-  { { .audio_type = 2, .video_type = 2, .item_cont = 1, .ogt = 3 }, 0xea },
-  { { .audio_type = 3, .video_type = 2, .item_cont = 1, .ogt = 3 }, 0xeb },
-  { { .audio_type = 0, .video_type = 3, .item_cont = 1, .ogt = 3 }, 0xec },
-  { { .audio_type = 1, .video_type = 3, .item_cont = 1, .ogt = 3 }, 0xed },
-  { { .audio_type = 2, .video_type = 3, .item_cont = 1, .ogt = 3 }, 0xee },
-  { { .audio_type = 3, .video_type = 3, .item_cont = 1, .ogt = 3 }, 0xef },
-  { { .audio_type = 0, .video_type = 4, .item_cont = 1, .ogt = 3 }, 0xf0 },
-  { { .audio_type = 1, .video_type = 4, .item_cont = 1, .ogt = 3 }, 0xf1 },
-  { { .audio_type = 2, .video_type = 4, .item_cont = 1, .ogt = 3 }, 0xf2 },
-  { { .audio_type = 3, .video_type = 4, .item_cont = 1, .ogt = 3 }, 0xf3 },
-  { { .audio_type = 0, .video_type = 5, .item_cont = 1, .ogt = 3 }, 0xf4 },
-  { { .audio_type = 1, .video_type = 5, .item_cont = 1, .ogt = 3 }, 0xf5 },
-  { { .audio_type = 2, .video_type = 5, .item_cont = 1, .ogt = 3 }, 0xf6 },
-  { { .audio_type = 3, .video_type = 5, .item_cont = 1, .ogt = 3 }, 0xf7 },
-  { { .audio_type = 0, .video_type = 6, .item_cont = 1, .ogt = 3 }, 0xf8 },
-  { { .audio_type = 1, .video_type = 6, .item_cont = 1, .ogt = 3 }, 0xf9 },
-  { { .audio_type = 2, .video_type = 6, .item_cont = 1, .ogt = 3 }, 0xfa },
-  { { .audio_type = 3, .video_type = 6, .item_cont = 1, .ogt = 3 }, 0xfb },
-  { { .audio_type = 0, .video_type = 7, .item_cont = 1, .ogt = 3 }, 0xfc },
-  { { .audio_type = 1, .video_type = 7, .item_cont = 1, .ogt = 3 }, 0xfd },
-  { { .audio_type = 2, .video_type = 7, .item_cont = 1, .ogt = 3 }, 0xfe },
-  { { .audio_type = 3, .video_type = 7, .item_cont = 1, .ogt = 3 }, 0xff }
+  { INFO_SPI_CONTENTS( 0, 0, 0, 0 ), 0x00 },
+  { INFO_SPI_CONTENTS( 1, 0, 0, 0 ), 0x01 },
+  { INFO_SPI_CONTENTS( 2, 0, 0, 0 ), 0x02 },
+  { INFO_SPI_CONTENTS( 3, 0, 0, 0 ), 0x03 },
+  { INFO_SPI_CONTENTS( 0, 1, 0, 0 ), 0x04 },
+  { INFO_SPI_CONTENTS( 1, 1, 0, 0 ), 0x05 },
+  { INFO_SPI_CONTENTS( 2, 1, 0, 0 ), 0x06 },
+  { INFO_SPI_CONTENTS( 3, 1, 0, 0 ), 0x07 },
+  { INFO_SPI_CONTENTS( 0, 2, 0, 0 ), 0x08 },
+  { INFO_SPI_CONTENTS( 1, 2, 0, 0 ), 0x09 },
+  { INFO_SPI_CONTENTS( 2, 2, 0, 0 ), 0x0a },
+  { INFO_SPI_CONTENTS( 3, 2, 0, 0 ), 0x0b },
+  { INFO_SPI_CONTENTS( 0, 3, 0, 0 ), 0x0c },
+  { INFO_SPI_CONTENTS( 1, 3, 0, 0 ), 0x0d },
+  { INFO_SPI_CONTENTS( 2, 3, 0, 0 ), 0x0e },
+  { INFO_SPI_CONTENTS( 3, 3, 0, 0 ), 0x0f },
+  { INFO_SPI_CONTENTS( 0, 4, 0, 0 ), 0x10 },
+  { INFO_SPI_CONTENTS( 1, 4, 0, 0 ), 0x11 },
+  { INFO_SPI_CONTENTS( 2, 4, 0, 0 ), 0x12 },
+  { INFO_SPI_CONTENTS( 3, 4, 0, 0 ), 0x13 },
+  { INFO_SPI_CONTENTS( 0, 5, 0, 0 ), 0x14 },
+  { INFO_SPI_CONTENTS( 1, 5, 0, 0 ), 0x15 },
+  { INFO_SPI_CONTENTS( 2, 5, 0, 0 ), 0x16 },
+  { INFO_SPI_CONTENTS( 3, 5, 0, 0 ), 0x17 },
+  { INFO_SPI_CONTENTS( 0, 6, 0, 0 ), 0x18 },
+  { INFO_SPI_CONTENTS( 1, 6, 0, 0 ), 0x19 },
+  { INFO_SPI_CONTENTS( 2, 6, 0, 0 ), 0x1a },
+  { INFO_SPI_CONTENTS( 3, 6, 0, 0 ), 0x1b },
+  { INFO_SPI_CONTENTS( 0, 7, 0, 0 ), 0x1c },
+  { INFO_SPI_CONTENTS( 1, 7, 0, 0 ), 0x1d },
+  { INFO_SPI_CONTENTS( 2, 7, 0, 0 ), 0x1e },
+  { INFO_SPI_CONTENTS( 3, 7, 0, 0 ), 0x1f },
+  { INFO_SPI_CONTENTS( 0, 0, 1, 0 ), 0x20 },
+  { INFO_SPI_CONTENTS( 1, 0, 1, 0 ), 0x21 },
+  { INFO_SPI_CONTENTS( 2, 0, 1, 0 ), 0x22 },
+  { INFO_SPI_CONTENTS( 3, 0, 1, 0 ), 0x23 },
+  { INFO_SPI_CONTENTS( 0, 1, 1, 0 ), 0x24 },
+  { INFO_SPI_CONTENTS( 1, 1, 1, 0 ), 0x25 },
+  { INFO_SPI_CONTENTS( 2, 1, 1, 0 ), 0x26 },
+  { INFO_SPI_CONTENTS( 3, 1, 1, 0 ), 0x27 },
+  { INFO_SPI_CONTENTS( 0, 2, 1, 0 ), 0x28 },
+  { INFO_SPI_CONTENTS( 1, 2, 1, 0 ), 0x29 },
+  { INFO_SPI_CONTENTS( 2, 2, 1, 0 ), 0x2a },
+  { INFO_SPI_CONTENTS( 3, 2, 1, 0 ), 0x2b },
+  { INFO_SPI_CONTENTS( 0, 3, 1, 0 ), 0x2c },
+  { INFO_SPI_CONTENTS( 1, 3, 1, 0 ), 0x2d },
+  { INFO_SPI_CONTENTS( 2, 3, 1, 0 ), 0x2e },
+  { INFO_SPI_CONTENTS( 3, 3, 1, 0 ), 0x2f },
+  { INFO_SPI_CONTENTS( 0, 4, 1, 0 ), 0x30 },
+  { INFO_SPI_CONTENTS( 1, 4, 1, 0 ), 0x31 },
+  { INFO_SPI_CONTENTS( 2, 4, 1, 0 ), 0x32 },
+  { INFO_SPI_CONTENTS( 3, 4, 1, 0 ), 0x33 },
+  { INFO_SPI_CONTENTS( 0, 5, 1, 0 ), 0x34 },
+  { INFO_SPI_CONTENTS( 1, 5, 1, 0 ), 0x35 },
+  { INFO_SPI_CONTENTS( 2, 5, 1, 0 ), 0x36 },
+  { INFO_SPI_CONTENTS( 3, 5, 1, 0 ), 0x37 },
+  { INFO_SPI_CONTENTS( 0, 6, 1, 0 ), 0x38 },
+  { INFO_SPI_CONTENTS( 1, 6, 1, 0 ), 0x39 },
+  { INFO_SPI_CONTENTS( 2, 6, 1, 0 ), 0x3a },
+  { INFO_SPI_CONTENTS( 3, 6, 1, 0 ), 0x3b },
+  { INFO_SPI_CONTENTS( 0, 7, 1, 0 ), 0x3c },
+  { INFO_SPI_CONTENTS( 1, 7, 1, 0 ), 0x3d },
+  { INFO_SPI_CONTENTS( 2, 7, 1, 0 ), 0x3e },
+  { INFO_SPI_CONTENTS( 3, 7, 1, 0 ), 0x3f },
+  { INFO_SPI_CONTENTS( 0, 0, 0, 1 ), 0x40 },
+  { INFO_SPI_CONTENTS( 1, 0, 0, 1 ), 0x41 },
+  { INFO_SPI_CONTENTS( 2, 0, 0, 1 ), 0x42 },
+  { INFO_SPI_CONTENTS( 3, 0, 0, 1 ), 0x43 },
+  { INFO_SPI_CONTENTS( 0, 1, 0, 1 ), 0x44 },
+  { INFO_SPI_CONTENTS( 1, 1, 0, 1 ), 0x45 },
+  { INFO_SPI_CONTENTS( 2, 1, 0, 1 ), 0x46 },
+  { INFO_SPI_CONTENTS( 3, 1, 0, 1 ), 0x47 },
+  { INFO_SPI_CONTENTS( 0, 2, 0, 1 ), 0x48 },
+  { INFO_SPI_CONTENTS( 1, 2, 0, 1 ), 0x49 },
+  { INFO_SPI_CONTENTS( 2, 2, 0, 1 ), 0x4a },
+  { INFO_SPI_CONTENTS( 3, 2, 0, 1 ), 0x4b },
+  { INFO_SPI_CONTENTS( 0, 3, 0, 1 ), 0x4c },
+  { INFO_SPI_CONTENTS( 1, 3, 0, 1 ), 0x4d },
+  { INFO_SPI_CONTENTS( 2, 3, 0, 1 ), 0x4e },
+  { INFO_SPI_CONTENTS( 3, 3, 0, 1 ), 0x4f },
+  { INFO_SPI_CONTENTS( 0, 4, 0, 1 ), 0x50 },
+  { INFO_SPI_CONTENTS( 1, 4, 0, 1 ), 0x51 },
+  { INFO_SPI_CONTENTS( 2, 4, 0, 1 ), 0x52 },
+  { INFO_SPI_CONTENTS( 3, 4, 0, 1 ), 0x53 },
+  { INFO_SPI_CONTENTS( 0, 5, 0, 1 ), 0x54 },
+  { INFO_SPI_CONTENTS( 1, 5, 0, 1 ), 0x55 },
+  { INFO_SPI_CONTENTS( 2, 5, 0, 1 ), 0x56 },
+  { INFO_SPI_CONTENTS( 3, 5, 0, 1 ), 0x57 },
+  { INFO_SPI_CONTENTS( 0, 6, 0, 1 ), 0x58 },
+  { INFO_SPI_CONTENTS( 1, 6, 0, 1 ), 0x59 },
+  { INFO_SPI_CONTENTS( 2, 6, 0, 1 ), 0x5a },
+  { INFO_SPI_CONTENTS( 3, 6, 0, 1 ), 0x5b },
+  { INFO_SPI_CONTENTS( 0, 7, 0, 1 ), 0x5c },
+  { INFO_SPI_CONTENTS( 1, 7, 0, 1 ), 0x5d },
+  { INFO_SPI_CONTENTS( 2, 7, 0, 1 ), 0x5e },
+  { INFO_SPI_CONTENTS( 3, 7, 0, 1 ), 0x5f },
+  { INFO_SPI_CONTENTS( 0, 0, 1, 1 ), 0x60 },
+  { INFO_SPI_CONTENTS( 1, 0, 1, 1 ), 0x61 },
+  { INFO_SPI_CONTENTS( 2, 0, 1, 1 ), 0x62 },
+  { INFO_SPI_CONTENTS( 3, 0, 1, 1 ), 0x63 },
+  { INFO_SPI_CONTENTS( 0, 1, 1, 1 ), 0x64 },
+  { INFO_SPI_CONTENTS( 1, 1, 1, 1 ), 0x65 },
+  { INFO_SPI_CONTENTS( 2, 1, 1, 1 ), 0x66 },
+  { INFO_SPI_CONTENTS( 3, 1, 1, 1 ), 0x67 },
+  { INFO_SPI_CONTENTS( 0, 2, 1, 1 ), 0x68 },
+  { INFO_SPI_CONTENTS( 1, 2, 1, 1 ), 0x69 },
+  { INFO_SPI_CONTENTS( 2, 2, 1, 1 ), 0x6a },
+  { INFO_SPI_CONTENTS( 3, 2, 1, 1 ), 0x6b },
+  { INFO_SPI_CONTENTS( 0, 3, 1, 1 ), 0x6c },
+  { INFO_SPI_CONTENTS( 1, 3, 1, 1 ), 0x6d },
+  { INFO_SPI_CONTENTS( 2, 3, 1, 1 ), 0x6e },
+  { INFO_SPI_CONTENTS( 3, 3, 1, 1 ), 0x6f },
+  { INFO_SPI_CONTENTS( 0, 4, 1, 1 ), 0x70 },
+  { INFO_SPI_CONTENTS( 1, 4, 1, 1 ), 0x71 },
+  { INFO_SPI_CONTENTS( 2, 4, 1, 1 ), 0x72 },
+  { INFO_SPI_CONTENTS( 3, 4, 1, 1 ), 0x73 },
+  { INFO_SPI_CONTENTS( 0, 5, 1, 1 ), 0x74 },
+  { INFO_SPI_CONTENTS( 1, 5, 1, 1 ), 0x75 },
+  { INFO_SPI_CONTENTS( 2, 5, 1, 1 ), 0x76 },
+  { INFO_SPI_CONTENTS( 3, 5, 1, 1 ), 0x77 },
+  { INFO_SPI_CONTENTS( 0, 6, 1, 1 ), 0x78 },
+  { INFO_SPI_CONTENTS( 1, 6, 1, 1 ), 0x79 },
+  { INFO_SPI_CONTENTS( 2, 6, 1, 1 ), 0x7a },
+  { INFO_SPI_CONTENTS( 3, 6, 1, 1 ), 0x7b },
+  { INFO_SPI_CONTENTS( 0, 7, 1, 1 ), 0x7c },
+  { INFO_SPI_CONTENTS( 1, 7, 1, 1 ), 0x7d },
+  { INFO_SPI_CONTENTS( 2, 7, 1, 1 ), 0x7e },
+  { INFO_SPI_CONTENTS( 3, 7, 1, 1 ), 0x7f },
+  { INFO_SPI_CONTENTS( 0, 0, 0, 2 ), 0x80 },
+  { INFO_SPI_CONTENTS( 1, 0, 0, 2 ), 0x81 },
+  { INFO_SPI_CONTENTS( 2, 0, 0, 2 ), 0x82 },
+  { INFO_SPI_CONTENTS( 3, 0, 0, 2 ), 0x83 },
+  { INFO_SPI_CONTENTS( 0, 1, 0, 2 ), 0x84 },
+  { INFO_SPI_CONTENTS( 1, 1, 0, 2 ), 0x85 },
+  { INFO_SPI_CONTENTS( 2, 1, 0, 2 ), 0x86 },
+  { INFO_SPI_CONTENTS( 3, 1, 0, 2 ), 0x87 },
+  { INFO_SPI_CONTENTS( 0, 2, 0, 2 ), 0x88 },
+  { INFO_SPI_CONTENTS( 1, 2, 0, 2 ), 0x89 },
+  { INFO_SPI_CONTENTS( 2, 2, 0, 2 ), 0x8a },
+  { INFO_SPI_CONTENTS( 3, 2, 0, 2 ), 0x8b },
+  { INFO_SPI_CONTENTS( 0, 3, 0, 2 ), 0x8c },
+  { INFO_SPI_CONTENTS( 1, 3, 0, 2 ), 0x8d },
+  { INFO_SPI_CONTENTS( 2, 3, 0, 2 ), 0x8e },
+  { INFO_SPI_CONTENTS( 3, 3, 0, 2 ), 0x8f },
+  { INFO_SPI_CONTENTS( 0, 4, 0, 2 ), 0x90 },
+  { INFO_SPI_CONTENTS( 1, 4, 0, 2 ), 0x91 },
+  { INFO_SPI_CONTENTS( 2, 4, 0, 2 ), 0x92 },
+  { INFO_SPI_CONTENTS( 3, 4, 0, 2 ), 0x93 },
+  { INFO_SPI_CONTENTS( 0, 5, 0, 2 ), 0x94 },
+  { INFO_SPI_CONTENTS( 1, 5, 0, 2 ), 0x95 },
+  { INFO_SPI_CONTENTS( 2, 5, 0, 2 ), 0x96 },
+  { INFO_SPI_CONTENTS( 3, 5, 0, 2 ), 0x97 },
+  { INFO_SPI_CONTENTS( 0, 6, 0, 2 ), 0x98 },
+  { INFO_SPI_CONTENTS( 1, 6, 0, 2 ), 0x99 },
+  { INFO_SPI_CONTENTS( 2, 6, 0, 2 ), 0x9a },
+  { INFO_SPI_CONTENTS( 3, 6, 0, 2 ), 0x9b },
+  { INFO_SPI_CONTENTS( 0, 7, 0, 2 ), 0x9c },
+  { INFO_SPI_CONTENTS( 1, 7, 0, 2 ), 0x9d },
+  { INFO_SPI_CONTENTS( 2, 7, 0, 2 ), 0x9e },
+  { INFO_SPI_CONTENTS( 3, 7, 0, 2 ), 0x9f },
+  { INFO_SPI_CONTENTS( 0, 0, 1, 2 ), 0xa0 },
+  { INFO_SPI_CONTENTS( 1, 0, 1, 2 ), 0xa1 },
+  { INFO_SPI_CONTENTS( 2, 0, 1, 2 ), 0xa2 },
+  { INFO_SPI_CONTENTS( 3, 0, 1, 2 ), 0xa3 },
+  { INFO_SPI_CONTENTS( 0, 1, 1, 2 ), 0xa4 },
+  { INFO_SPI_CONTENTS( 1, 1, 1, 2 ), 0xa5 },
+  { INFO_SPI_CONTENTS( 2, 1, 1, 2 ), 0xa6 },
+  { INFO_SPI_CONTENTS( 3, 1, 1, 2 ), 0xa7 },
+  { INFO_SPI_CONTENTS( 0, 2, 1, 2 ), 0xa8 },
+  { INFO_SPI_CONTENTS( 1, 2, 1, 2 ), 0xa9 },
+  { INFO_SPI_CONTENTS( 2, 2, 1, 2 ), 0xaa },
+  { INFO_SPI_CONTENTS( 3, 2, 1, 2 ), 0xab },
+  { INFO_SPI_CONTENTS( 0, 3, 1, 2 ), 0xac },
+  { INFO_SPI_CONTENTS( 1, 3, 1, 2 ), 0xad },
+  { INFO_SPI_CONTENTS( 2, 3, 1, 2 ), 0xae },
+  { INFO_SPI_CONTENTS( 3, 3, 1, 2 ), 0xaf },
+  { INFO_SPI_CONTENTS( 0, 4, 1, 2 ), 0xb0 },
+  { INFO_SPI_CONTENTS( 1, 4, 1, 2 ), 0xb1 },
+  { INFO_SPI_CONTENTS( 2, 4, 1, 2 ), 0xb2 },
+  { INFO_SPI_CONTENTS( 3, 4, 1, 2 ), 0xb3 },
+  { INFO_SPI_CONTENTS( 0, 5, 1, 2 ), 0xb4 },
+  { INFO_SPI_CONTENTS( 1, 5, 1, 2 ), 0xb5 },
+  { INFO_SPI_CONTENTS( 2, 5, 1, 2 ), 0xb6 },
+  { INFO_SPI_CONTENTS( 3, 5, 1, 2 ), 0xb7 },
+  { INFO_SPI_CONTENTS( 0, 6, 1, 2 ), 0xb8 },
+  { INFO_SPI_CONTENTS( 1, 6, 1, 2 ), 0xb9 },
+  { INFO_SPI_CONTENTS( 2, 6, 1, 2 ), 0xba },
+  { INFO_SPI_CONTENTS( 3, 6, 1, 2 ), 0xbb },
+  { INFO_SPI_CONTENTS( 0, 7, 1, 2 ), 0xbc },
+  { INFO_SPI_CONTENTS( 1, 7, 1, 2 ), 0xbd },
+  { INFO_SPI_CONTENTS( 2, 7, 1, 2 ), 0xbe },
+  { INFO_SPI_CONTENTS( 3, 7, 1, 2 ), 0xbf },
+  { INFO_SPI_CONTENTS( 0, 0, 0, 3 ), 0xc0 },
+  { INFO_SPI_CONTENTS( 1, 0, 0, 3 ), 0xc1 },
+  { INFO_SPI_CONTENTS( 2, 0, 0, 3 ), 0xc2 },
+  { INFO_SPI_CONTENTS( 3, 0, 0, 3 ), 0xc3 },
+  { INFO_SPI_CONTENTS( 0, 1, 0, 3 ), 0xc4 },
+  { INFO_SPI_CONTENTS( 1, 1, 0, 3 ), 0xc5 },
+  { INFO_SPI_CONTENTS( 2, 1, 0, 3 ), 0xc6 },
+  { INFO_SPI_CONTENTS( 3, 1, 0, 3 ), 0xc7 },
+  { INFO_SPI_CONTENTS( 0, 2, 0, 3 ), 0xc8 },
+  { INFO_SPI_CONTENTS( 1, 2, 0, 3 ), 0xc9 },
+  { INFO_SPI_CONTENTS( 2, 2, 0, 3 ), 0xca },
+  { INFO_SPI_CONTENTS( 3, 2, 0, 3 ), 0xcb },
+  { INFO_SPI_CONTENTS( 0, 3, 0, 3 ), 0xcc },
+  { INFO_SPI_CONTENTS( 1, 3, 0, 3 ), 0xcd },
+  { INFO_SPI_CONTENTS( 2, 3, 0, 3 ), 0xce },
+  { INFO_SPI_CONTENTS( 3, 3, 0, 3 ), 0xcf },
+  { INFO_SPI_CONTENTS( 0, 4, 0, 3 ), 0xd0 },
+  { INFO_SPI_CONTENTS( 1, 4, 0, 3 ), 0xd1 },
+  { INFO_SPI_CONTENTS( 2, 4, 0, 3 ), 0xd2 },
+  { INFO_SPI_CONTENTS( 3, 4, 0, 3 ), 0xd3 },
+  { INFO_SPI_CONTENTS( 0, 5, 0, 3 ), 0xd4 },
+  { INFO_SPI_CONTENTS( 1, 5, 0, 3 ), 0xd5 },
+  { INFO_SPI_CONTENTS( 2, 5, 0, 3 ), 0xd6 },
+  { INFO_SPI_CONTENTS( 3, 5, 0, 3 ), 0xd7 },
+  { INFO_SPI_CONTENTS( 0, 6, 0, 3 ), 0xd8 },
+  { INFO_SPI_CONTENTS( 1, 6, 0, 3 ), 0xd9 },
+  { INFO_SPI_CONTENTS( 2, 6, 0, 3 ), 0xda },
+  { INFO_SPI_CONTENTS( 3, 6, 0, 3 ), 0xdb },
+  { INFO_SPI_CONTENTS( 0, 7, 0, 3 ), 0xdc },
+  { INFO_SPI_CONTENTS( 1, 7, 0, 3 ), 0xdd },
+  { INFO_SPI_CONTENTS( 2, 7, 0, 3 ), 0xde },
+  { INFO_SPI_CONTENTS( 3, 7, 0, 3 ), 0xdf },
+  { INFO_SPI_CONTENTS( 0, 0, 1, 3 ), 0xe0 },
+  { INFO_SPI_CONTENTS( 1, 0, 1, 3 ), 0xe1 },
+  { INFO_SPI_CONTENTS( 2, 0, 1, 3 ), 0xe2 },
+  { INFO_SPI_CONTENTS( 3, 0, 1, 3 ), 0xe3 },
+  { INFO_SPI_CONTENTS( 0, 1, 1, 3 ), 0xe4 },
+  { INFO_SPI_CONTENTS( 1, 1, 1, 3 ), 0xe5 },
+  { INFO_SPI_CONTENTS( 2, 1, 1, 3 ), 0xe6 },
+  { INFO_SPI_CONTENTS( 3, 1, 1, 3 ), 0xe7 },
+  { INFO_SPI_CONTENTS( 0, 2, 1, 3 ), 0xe8 },
+  { INFO_SPI_CONTENTS( 1, 2, 1, 3 ), 0xe9 },
+  { INFO_SPI_CONTENTS( 2, 2, 1, 3 ), 0xea },
+  { INFO_SPI_CONTENTS( 3, 2, 1, 3 ), 0xeb },
+  { INFO_SPI_CONTENTS( 0, 3, 1, 3 ), 0xec },
+  { INFO_SPI_CONTENTS( 1, 3, 1, 3 ), 0xed },
+  { INFO_SPI_CONTENTS( 2, 3, 1, 3 ), 0xee },
+  { INFO_SPI_CONTENTS( 3, 3, 1, 3 ), 0xef },
+  { INFO_SPI_CONTENTS( 0, 4, 1, 3 ), 0xf0 },
+  { INFO_SPI_CONTENTS( 1, 4, 1, 3 ), 0xf1 },
+  { INFO_SPI_CONTENTS( 2, 4, 1, 3 ), 0xf2 },
+  { INFO_SPI_CONTENTS( 3, 4, 1, 3 ), 0xf3 },
+  { INFO_SPI_CONTENTS( 0, 5, 1, 3 ), 0xf4 },
+  { INFO_SPI_CONTENTS( 1, 5, 1, 3 ), 0xf5 },
+  { INFO_SPI_CONTENTS( 2, 5, 1, 3 ), 0xf6 },
+  { INFO_SPI_CONTENTS( 3, 5, 1, 3 ), 0xf7 },
+  { INFO_SPI_CONTENTS( 0, 6, 1, 3 ), 0xf8 },
+  { INFO_SPI_CONTENTS( 1, 6, 1, 3 ), 0xf9 },
+  { INFO_SPI_CONTENTS( 2, 6, 1, 3 ), 0xfa },
+  { INFO_SPI_CONTENTS( 3, 6, 1, 3 ), 0xfb },
+  { INFO_SPI_CONTENTS( 0, 7, 1, 3 ), 0xfc },
+  { INFO_SPI_CONTENTS( 1, 7, 1, 3 ), 0xfd },
+  { INFO_SPI_CONTENTS( 2, 7, 1, 3 ), 0xfe },
+  { INFO_SPI_CONTENTS( 3, 7, 1, 3 ), 0xff }
 };
 
 int
@@ -300,12 +306,12 @@
       const union {
 	InfoSpiContents bf;
 	uint8_t byte;
-      } u = { .bf = InfoSpiContents_table[i].bitfield };
+      } *u = &InfoSpiContents_table[i].bitfield;
 
-      if (u.byte != InfoSpiContents_table[i].intval)
+      if (u->byte != InfoSpiContents_table[i].intval)
 	{
 	  printf ("failed at index %d (%.2x != %.2x)\n", 
-		  i, u.byte, InfoSpiContents_table[i].intval);
+		  i, u->byte, InfoSpiContents_table[i].intval);
 	  return 1;
 	}
     }
--- ./libvcd/vcd_iso9660_private.h	Tue Dec 24 22:06:00 2002
+++ ../vcdimager-0.7.13/./libvcd/vcd_iso9660_private.h	Fri Feb 28 16:31:39 2003
@@ -32,6 +32,10 @@
 #define ISO_XA_MARKER_STRING    "CD-XA001"
 #define ISO_XA_MARKER_OFFSET    1024
 
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (1)
+#endif
+
 struct iso_volume_descriptor {
   uint8_t  type; /* 711 */
   char     id[5];
@@ -104,6 +108,10 @@
 } GNUC_PACKED;
 
 #define struct_iso_directory_record_SIZEOF 33
+
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (0)
+#endif
 
 #endif /* __VCD_ISO9660_PRIVATE_H__ */
 
--- ./libvcd/vcd_mmc_private.h	Sun Jan 19 10:09:59 2003
+++ ../vcdimager-0.7.13/./libvcd/vcd_mmc_private.h	Fri Feb 28 16:31:39 2003
@@ -25,6 +25,10 @@
 
 #include <libvcd/vcd_types.h>
 
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (1)
+#endif
+
 /* Multimedia Commands, see [mmc], table N.1 */
 enum mmc_command 
 {
@@ -521,6 +525,10 @@
 } GNUC_PACKED;
 
 #define struct_cue_sheet_data_SIZEOF 8
+
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (0)
+#endif
 
 typedef struct
 {
--- ./libvcd/vcd_files_private.h	Tue Dec 24 22:06:00 2002
+++ ../vcdimager-0.7.13/./libvcd/vcd_files_private.h	Fri Feb 28 16:31:39 2003
@@ -47,6 +47,10 @@
 #define ENTRIES_VERSION_HQVCD 0x01
 #define ENTRIES_SPTAG_HQVCD   0x00
 
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (1)
+#endif
+
 typedef struct {
   char ID[8];                             /* "ENTRYVCD" */
   uint8_t version;                        /* 0x02 --- VCD2.0
@@ -415,7 +419,13 @@
 
 typedef struct {
   /* TracksSVD tracks_svd; */
+#if defined(__sgi) && !defined(__GNUC__)
+  /* SGI MIPSpro C 7.3.x does not accept structures composed by a single
+     variable size array. */
+  SVDTrackContent contents[1];                /* indicates track contents */
+#else
   SVDTrackContent contents[EMPTY_ARRAY_SIZE]; /* indicates track contents */
+#endif
 } GNUC_PACKED TracksSVD2;
 
 #define TracksSVD2_SIZEOF 0
@@ -523,9 +533,17 @@
 
 typedef struct {
   /* ScandataDat head; */
+#if defined(__sgi) && !defined(__GNUC__)
+  /* SGI MIPSpro C 7.3.x does not accept structures composed by a single
+     variable size array. */
+  uint16_t spi_indexes[1];                /* Indexes into
+                                             the following scandata
+                                             table */
+#else
   uint16_t spi_indexes[EMPTY_ARRAY_SIZE]; /* Indexes into
                                              the following scandata
                                              table */
+#endif
 } GNUC_PACKED ScandataDat2;
 
 #define ScandataDat2_SIZEOF 0
@@ -548,10 +566,20 @@
 
 typedef struct {
   /* ScandataDat3 head; */
+#if defined(__sgi) && !defined(__GNUC__)
+  /* SGI MIPSpro C 7.3.x does not accept structures composed by a single
+     variable size array. */
+  msf_t scandata_table[1];
+#else
   msf_t scandata_table[EMPTY_ARRAY_SIZE];
+#endif
 } GNUC_PACKED ScandataDat4;
 
 #define ScandataDat4_SIZEOF 0
+
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (0)
+#endif
 
 #endif /* __VCD_FILES_PRIVATE_H__ */
 
--- ./libvcd/vcd_image_nrg.c	Wed Jan  8 12:34:06 2003
+++ ../vcdimager-0.7.13/./libvcd/vcd_image_nrg.c	Fri Feb 28 16:31:39 2003
@@ -43,6 +43,10 @@
    least structure were set big endian, so at reverse
    engineering wasn't such a big headache... */
 
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (1)
+#endif
+
 typedef struct {
   uint32_t start      GNUC_PACKED;
   uint32_t length     GNUC_PACKED;
@@ -75,6 +79,10 @@
   char data[EMPTY_ARRAY_SIZE]    GNUC_PACKED;
 } _chunk_t;
 
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (0)
+#endif
+
 /* to be converted into BE */
 #define CUEX_ID  0x43554558
 #define DAOX_ID  0x44414f58
@@ -143,6 +151,11 @@
   size = vcd_data_source_stat (_obj->nrg_src);
 
   {
+
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (1)
+#endif
+
     union {
       struct {
 	uint32_t __x          GNUC_PACKED;
@@ -155,6 +168,10 @@
       } v55;
     } buf;
 
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (0)
+#endif
+
     vcd_assert (sizeof (buf) == 12);
 
     vcd_data_source_seek (_obj->nrg_src, size - sizeof (buf));
@@ -408,11 +425,27 @@
 {
   _img_nrg_src_t *_data;
 
+#if defined(__sgi) && !defined(__GNUC__)
   vcd_image_source_funcs _funcs = {
+    NULL,
+    _source_free,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    _read_mode2_sector,
+    NULL,
+    NULL,
+    _stat_size
+  };
+#else
+  vcd_image_source_funcs _funcs = {
     .read_mode2_sector = _read_mode2_sector,
     .stat_size         = _stat_size,
     .free              = _source_free
   };
+#endif
 
   if (!nrg_source)
     return NULL;
@@ -656,6 +689,14 @@
 {
   _img_nrg_snk_t *_data;
 
+#if defined(__sgi) && !defined(__GNUC__)
+  vcd_image_sink_funcs _funcs = {
+    _set_cuesheet,
+    _write,
+    _sink_free,
+    _sink_set_arg
+  };
+#else
   vcd_image_sink_funcs _funcs = {
     .set_cuesheet = _set_cuesheet,
     .write        = _write,
@@ -662,6 +703,7 @@
     .free         = _sink_free,
     .set_arg      = _sink_set_arg
   };
+#endif
 
   _data = _vcd_malloc (sizeof (_img_nrg_snk_t));
   _data->nrg_fname = strdup ("videocd.nrg");
--- ./libvcd/vcd_files.c	Tue Nov 27 12:33:51 2001
+++ ../vcdimager-0.7.13/./libvcd/vcd_files.c	Fri Feb 28 16:32:48 2003
@@ -38,6 +38,11 @@
 
 #include <libvcd/vcd_pbc.h>
 
+#if defined(__sgi) && !defined(__GNUC__)
+#undef	offsetof
+#define	offsetof(s, m)	(size_t)(&(((s *)0)->m))
+#endif
+
 static const char _rcsid[] = "$Id: vcd_files.c,v 1.51 2001/11/27 17:33:51 hvr Exp $";
 
 inline static bool
@@ -793,8 +798,13 @@
   retval += sizeof (msf_t) * _vcd_list_length (obj->mpeg_track_list);
 
   /* struct 2 */
+#if (defined(__sgi) && defined(__GNUC__)) || !defined(__sgi)
+  /* SGI MIPSpro C 7.3.x does not accept structures composed by a single
+     variable size array. Also, ScandataDat2 should be always 0, so
+     why bother to add its size to retval? */
   vcd_assert (sizeof (ScandataDat2) == 0);
   retval += sizeof (ScandataDat2);
+#endif
   retval += sizeof (uint16_t) * 0;
 
   /* struct 3 */
@@ -802,8 +812,13 @@
   retval += (sizeof (uint8_t) + sizeof (uint16_t)) * _vcd_list_length (obj->mpeg_track_list);
 
   /* struct 4 */
+#if (defined(__sgi) && defined(__GNUC__)) || !defined(__sgi)
+  /* SGI MIPSpro C 7.3.x does not accept structures composed by a single
+     variable size array. Also, ScandataDat4 should be always 0, so
+     why bother to add its size to retval? */
   vcd_assert (sizeof (ScandataDat4) == 0);
   retval += sizeof (ScandataDat4);
+#endif
   {
     VcdListNode *node;
     _VCD_LIST_FOREACH (node, obj->mpeg_track_list)
--- ./libvcd/vcd_util.c	Mon Jan  6 12:20:00 2003
+++ ../vcdimager-0.7.13/./libvcd/vcd_util.c	Fri Feb 28 16:31:39 2003
@@ -258,7 +258,7 @@
 _vcd_lba_to_msf_str (uint32_t lba)
 {
   char buf[16];
-  msf_t _msf = { .m = 0, .s = 0, .f = 0 };
+  msf_t _msf = { 0, 0, 0 };
 
   lba_to_msf (lba, &_msf);
 
--- ./libvcd/vcd_mpeg.c	Sun Jan 19 10:09:59 2003
+++ ../vcdimager-0.7.13/./libvcd/vcd_mpeg.c	Fri Feb 28 16:31:39 2003
@@ -320,11 +320,20 @@
                   VcdMpegStreamCtx *state)
 {
   unsigned pos = 0;
+
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (1)
+#endif
+
   struct {
     uint8_t tag;
     uint8_t len;
     uint8_t data[EMPTY_ARRAY_SIZE];
   } GNUC_PACKED const *udg = buf;
+
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (0)
+#endif
 
   if (udg->tag == 0x00) /* if first tag's already 0x00 */
     {
--- ./libvcd/vcd_mpeg.h	Tue Dec 24 22:06:00 2002
+++ ../vcdimager-0.7.13/./libvcd/vcd_mpeg.h	Fri Feb 28 16:31:39 2003
@@ -34,6 +34,10 @@
   MPEG_VERS_MPEG2 = 2
 } mpeg_vers_t;
 
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (1)
+#endif
+
 struct vcd_mpeg_scan_data_t {
   uint8_t tag;
   uint8_t len;
@@ -42,6 +46,10 @@
   msf_t back_ofs;
   msf_t forw_ofs;
 } GNUC_PACKED;
+
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (0)
+#endif
 
 #define struct_vcd_mpeg_scan_data_t_SIZEOF 14
 
--- ./libvcd/vcd_pbc.h	Tue Dec 24 22:06:00 2002
+++ ../vcdimager-0.7.13/./libvcd/vcd_pbc.h	Fri Feb 28 16:31:39 2003
@@ -39,6 +39,11 @@
 
 /* (0,0) == upper left , (255,255) == lower right 
    setting all to zero disables area */
+
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (1)
+#endif
+
 struct psd_area_t
 {
   uint8_t x1; /* upper left */
@@ -46,6 +51,10 @@
   uint8_t x2; /* lower right */
   uint8_t y2; /* lower right */
 } GNUC_PACKED;
+
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (0)
+#endif
 
 #define struct_psd_area_t_SIZEOF 4
 
--- ./libvcd/vcd_pbc.c	Wed Dec 25 10:31:32 2002
+++ ../vcdimager-0.7.13/./libvcd/vcd_pbc.c	Fri Feb 28 16:33:19 2003
@@ -34,6 +34,11 @@
 #include <libvcd/vcd_files_private.h>
 #include <libvcd/vcd_bytesex.h>
 
+#if defined(__sgi) && !defined(__GNUC__)
+#undef	offsetof
+#define	offsetof(s, m)	(size_t)(&(((s *)0)->m))
+#endif
+
 static const char _rcsid[] = "$Id: vcd_pbc.c,v 1.26 2002/12/25 15:31:32 hvr Exp $";
 
 static uint8_t
--- ./libvcd/vcd_image_bincue.c	Sun Jan 19 10:09:59 2003
+++ ../vcdimager-0.7.13/./libvcd/vcd_image_bincue.c	Fri Feb 28 16:31:39 2003
@@ -156,12 +156,28 @@
 {
   _img_bincue_src_t *_data;
 
+#if defined(__sgi) && !defined(__GNUC__)
   vcd_image_source_funcs _funcs = {
+    NULL,
+    _source_free,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    _read_mode2_sector,
+    NULL,
+    _source_set_arg,
+    _stat_size
+  };
+#else
+  vcd_image_source_funcs _funcs = {
     .read_mode2_sector = _read_mode2_sector,
     .stat_size         = _stat_size,
     .free              = _source_free,
     .set_arg           = _source_set_arg  
   };
+#endif
 
   _data = _vcd_malloc (sizeof (_img_bincue_src_t));
   _data->bin_name = strdup ("videocd.bin");
@@ -358,6 +374,14 @@
 {
   _img_bincue_snk_t *_data;
 
+#if defined(__sgi) && !defined(__GNUC__)
+  vcd_image_sink_funcs _funcs = {
+    _set_cuesheet,
+    _write,
+    _sink_free,
+    _sink_set_arg
+  };
+#else
   vcd_image_sink_funcs _funcs = {
     .set_cuesheet = _set_cuesheet,
     .write        = _write,
@@ -364,6 +388,7 @@
     .free         = _sink_free,
     .set_arg      = _sink_set_arg
   };
+#endif
 
   _data = _vcd_malloc (sizeof (_img_bincue_snk_t));
 
--- ./libvcd/vcd_image_cdrdao.c	Wed Jan  8 12:34:06 2003
+++ ../vcdimager-0.7.13/./libvcd/vcd_image_cdrdao.c	Fri Feb 28 16:31:39 2003
@@ -292,12 +292,21 @@
 {
   _img_cdrdao_snk_t *_data;
   
+#if defined(__sgi) && !defined(__GNUC__)
   vcd_image_sink_funcs _funcs = {
+    _set_cuesheet,
+    _write,
+    _sink_free,
+    _sink_set_arg
+  };
+#else
+  vcd_image_sink_funcs _funcs = {
     .set_cuesheet = _set_cuesheet,
     .write        = _write,
     .free         = _sink_free,
     .set_arg      = _sink_set_arg
   };
+#endif
 
   _data = _vcd_malloc (sizeof (_img_cdrdao_snk_t));
 
--- ./libvcd/vcd_types.h	Wed Feb  5 06:50:14 2003
+++ ../vcdimager-0.7.13/./libvcd/vcd_types.h	Fri Feb 28 16:31:39 2003
@@ -134,7 +134,7 @@
 
 /* user directed static branch prediction
  */
-#if __GNUC__ == 2 && __GNUC_MINOR__ < 96
+#if (__GNUC__ == 2 && __GNUC_MINOR__ < 96) || (defined(__sgi) && !defined(__GNUC__))
 # define GNUC_LIKELY(x)   (x) 
 # define GNUC_UNLIKELY(x) (x)
 #else /* supported with gcc 2.96+ */
@@ -148,9 +148,18 @@
 
 /* In many structures on the disk a sector address is stored as a
    BCD-encoded mmssff in three bytes. */
+
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (1)
+#endif
+
 typedef struct {
   uint8_t m, s, f;
 } GNUC_PACKED msf_t;
+
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (0)
+#endif
 
 #define msf_t_SIZEOF 3
 
--- ./libvcd/vcd_xa.h	Tue Dec 24 22:06:00 2002
+++ ../vcdimager-0.7.13/./libvcd/vcd_xa.h	Fri Feb 28 16:31:39 2003
@@ -52,6 +52,10 @@
 
 /* the struct */
 
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (1)
+#endif
+
 typedef struct /* big endian!! */
 {
   uint16_t user_id;       /* 0 */
@@ -61,6 +65,10 @@
   uint8_t  filenum;       /* file number, see also XA subheader */
   uint8_t  reserved[5];   /* zero */
 } GNUC_PACKED vcd_xa_t;
+
+#if defined(__sgi) && !defined(__GNUC__)
+#pragma pack (0)
+#endif
 
 #define vcd_xa_t_SIZEOF 14
 
--- ./ltmain.sh	Thu Jul 25 06:03:44 2002
+++ ../vcdimager-0.7.13/./ltmain.sh	Fri Feb 28 16:35:23 2003
@@ -61,7 +61,7 @@
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
 mv="mv -f"
 rm="rm -f"