[Stratagus-CVS] stratagus/src/sound ccl_sound.c unitsound.c

[Nehal Mistry]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Nehal Mistry <address@hidden>   03/12/01 14:44:20

Modified files:
        src/sound      : ccl_sound.c unitsound.c 

Log message:
        fix gcc warnings

Patches:
Index: stratagus/src/sound/ccl_sound.c
diff -u stratagus/src/sound/ccl_sound.c:1.57 
stratagus/src/sound/ccl_sound.c:1.58
--- stratagus/src/sound/ccl_sound.c:1.57        Mon Dec  1 12:57:24 2003
+++ stratagus/src/sound/ccl_sound.c     Mon Dec  1 14:44:19 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: ccl_sound.c,v 1.57 2003/12/01 17:57:24 jsalmon3 Exp $
+//     $Id: ccl_sound.c,v 1.58 2003/12/01 19:44:19 nehalmistry Exp $
 
 //@{
 
@@ -158,7 +158,7 @@
        // only one file
        c_name = gh_scm2newstr(name, NULL);
        c_file = gh_scm2newstr(file, NULL);
-       id = MakeSound(c_name, &c_file, 1);
+       id = MakeSound(c_name, (const char**)&c_file, 1);
        DebugLevel3("Making sound `%s' from `%s' with id %p\n" _C_ c_name _C_
            c_file _C_ id);
        // the sound name (c_name) must be kept but the file name can be freed
@@ -183,7 +183,7 @@
            file = gh_cdr(file);
        }
        //FIXME: check size before casting
-       id = MakeSound(c_name, c_files, (unsigned char)nb);
+       id = MakeSound(c_name, (const char**)c_files, (unsigned char)nb);
        for (i = 0; i < nb; ++i) {
            free(c_files[i]);
        }
Index: stratagus/src/sound/unitsound.c
diff -u stratagus/src/sound/unitsound.c:1.25 
stratagus/src/sound/unitsound.c:1.26
--- stratagus/src/sound/unitsound.c:1.25        Sat Nov  1 23:20:38 2003
+++ stratagus/src/sound/unitsound.c     Mon Dec  1 14:44:19 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: unitsound.c,v 1.25 2003/11/02 04:20:38 jsalmon3 Exp $
+//     $Id: unitsound.c,v 1.26 2003/12/01 19:44:19 nehalmistry Exp $
 
 //@{
 
@@ -157,7 +157,7 @@
 
     if (SimpleSounds) {
        for (i = 0; SimpleSounds[i].Name; ++i) {
-           MakeSound(SimpleSounds[i].Name, &(SimpleSounds[i].File), 1);
+           MakeSound(SimpleSounds[i].Name, (const 
char**)&(SimpleSounds[i].File), 1);
        }
     }
 }
@@ -172,7 +172,7 @@
 
     if (SoundGroups) {
        for (i = 0; SoundGroups[i].Name; ++i) {
-           MakeSound(SoundGroups[i].Name, SoundGroups[i].Sounds,
+           MakeSound(SoundGroups[i].Name, (const char**)SoundGroups[i].Sounds,
                NbSoundsInGroup(SoundGroups[i].Sounds));
        }
     }