Updated the CodeWarrior project files

libsdl-org · May 20, 2002 · 9317184 · 9317184
1 parent 82e60a0
commit 9317184
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 2,938 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,7 @@
 
 1.2.4:
+Sam Lantinga - Mon May 20 09:11:22 PDT 2002
+ * Updated the CodeWarrior project files
 Sam Lantinga - Sun May 19 13:46:29 PDT 2002
  * Added a function to query the music format: Mix_GetMusicType()
 Sam Lantinga - Sat May 18 12:45:16 PDT 2002

diff --git a/CWProjects.sea.bin b/CWProjects.sea.bin
diff --git a/CWprojects.sea.hqx b/CWprojects.sea.hqx
diff --git a/Makefile.am b/Makefile.am
@@ -52,7 +52,7 @@ EXTRA_DIST =			\
 	VisualC.zip		\
 	PBProjects.tar.gz	\
 	MPWmake.sea.bin		\
-	CWprojects.sea.hqx	\
+	CWProjects.sea.bin	\
 	SDL_mixer.spec		\
 	SDL_mixer.spec.in	\
 	autogen.sh

diff --git a/SDL_mixer.h b/SDL_mixer.h
@@ -144,7 +144,7 @@ extern DECLSPEC void SDLCALL Mix_FreeMusic(Mix_Music *music);
 /* Find out the music format of a mixer music, or the currently playing
    music, if 'music' is NULL.
 */
-extern DECLSPEC Mix_MusicType Mix_GetMusicType(const Mix_Music *music);
+extern DECLSPEC Mix_MusicType SDLCALL Mix_GetMusicType(const Mix_Music *music);
 
 /* Set a function that is called after all mixing is performed.
    This can be used to provide real-time visual display of the audio stream

diff --git a/load_voc.c b/load_voc.c
@@ -356,14 +356,15 @@ static int voc_read(SDL_RWops *src, vs_t *v, Uint8 *buf, SDL_AudioSpec *spec)
         v->rest -= done;
         if (v->size == ST_SIZE_WORD)
         {
-            done >>= 1;
             #if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
+                Uint16 *samples = (Uint16 *)buf;
                 for (; v->rest > 0; v->rest -= 2)
                 {
-                    *((Uint16 *) buf) = SDL_SwapLE16(*((Uint16 *) buf));
-                    ((Uint16 *) buf)++;
+                    *samples = SDL_SwapLE16(*samples);
+                    samples++;
                 }
             #endif
+            done >>= 1;
         }
     }
 

diff --git a/timidity/common.c b/timidity/common.c
@@ -126,12 +126,14 @@ FILE *open_file(char *name, int decompress, int noise_mode)
   if ((fp=try_to_open(current_filename, decompress, noise_mode)))
     return fp;
 
+#ifdef ENOENT
   if (noise_mode && (errno != ENOENT))
     {
       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s", 
 	   current_filename, strerror(errno));
       return 0;
     }
+#endif
 
   if (name[0] != PATH_SEP)
     while (plp)  /* Try along the path then */
@@ -148,12 +150,14 @@ FILE *open_file(char *name, int decompress, int noise_mode)
 	ctl->cmsg(CMSG_INFO, VERB_DEBUG, "Trying to open %s", current_filename);
 	if ((fp=try_to_open(current_filename, decompress, noise_mode)))
 	  return fp;
+#ifdef ENOENT
 	if (noise_mode && (errno != ENOENT))
 	  {
 	    ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s", 
 		 current_filename, strerror(errno));
 	    return 0;
 	  }
+#endif
 	plp=plp->next;
       }
 
@@ -209,6 +213,7 @@ void *safe_malloc(size_t count)
 
   ctl->close();
   exit(10);
+  return(NULL);
 }
 
 /* This adds a directory to the path list */