From dde50ca5471e63b280c17de11aa7d7331c2746e4 Mon Sep 17 00:00:00 2001
From: pjcreath <pjcreath>
Date: Tue, 10 Jun 2008 00:45:08 +0000
Subject: [PATCH] Fixed pregap regression failure on non-Intel architectures,
 removed warnings

---
 lib/driver/image/nrg.h | 4 ++--
 test/testpregap.c.in   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/driver/image/nrg.h b/lib/driver/image/nrg.h
index 3f6b8cf1..fe51c9c2 100644
--- a/lib/driver/image/nrg.h
+++ b/lib/driver/image/nrg.h
@@ -1,5 +1,5 @@
 /*
-  $Id: nrg.h,v 1.6 2008/04/21 18:30:22 karl Exp $
+  $Id: nrg.h,v 1.7 2008/06/10 00:45:08 pjcreath Exp $
 
   Copyright (C) 2004, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
   Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -92,7 +92,7 @@ typedef struct {
   uint32_t end_of_track        GNUC_PACKED;
 } _daoi_array_t;
 
-typedef struct {
+typedef struct GNUC_PACKED {
   uint32_t chunk_size_le       GNUC_PACKED;
   char     psz_mcn[CDIO_MCN_SIZE];
   uint8_t  unknown[3];
diff --git a/test/testpregap.c.in b/test/testpregap.c.in
index 529e9c61..a224e082 100644
--- a/test/testpregap.c.in
+++ b/test/testpregap.c.in
@@ -1,5 +1,5 @@
 /*
-  $Id: testpregap.c.in,v 1.1 2008/05/05 23:58:28 rocky Exp $
+  $Id: testpregap.c.in,v 1.2 2008/06/10 00:45:09 pjcreath Exp $
 
   Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@gnu.org>
   Copyright (C) 2008 Robert W. Fuller <hydrologiccycle@gmail.com>
@@ -57,7 +57,7 @@ log_handler (cdio_log_level_t level, const char message[])
 
 typedef struct _pregap_list_t {
 
-  char *image;
+  const char *image;
   track_t track;
   lsn_t pregap;
 
@@ -83,7 +83,7 @@ int
 main(int argc, const char *argv[])
 {
   CdIo_t *cdObj;
-  char *image;
+  const char *image;
   lsn_t pregap;
   int i;
   int rc = 0;