[Tux4kids-commits] r1375 - branches/commonification/tuxmath/trunk/src

[Bolesław Kulbabiński]

Author: bolekk-guest
Date: 2009-08-05 19:49:54 +0000 (Wed, 05 Aug 2009)
New Revision: 1375

Modified:
   branches/commonification/tuxmath/trunk/src/audio.c
   branches/commonification/tuxmath/trunk/src/loaders.c
   branches/commonification/tuxmath/trunk/src/loaders.h
Log:
small fixes in TuxMath

Modified: branches/commonification/tuxmath/trunk/src/audio.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/audio.c	2009-08-05 19:49:27 UTC (rev 1374)
+++ branches/commonification/tuxmath/trunk/src/audio.c	2009-08-05 19:49:54 UTC (rev 1375)
@@ -20,12 +20,12 @@
 *                                                                         *
 ***************************************************************************/
 
-#ifndef HAVE_LIBT4KCOMMON
 
 #include "tuxmath.h"
 #include "options.h"   //Needed for Opts_UsingSound()
 #include "titlescreen.h"
 
+#ifndef HAVE_LIBT4KCOMMON
 void PlaySound(Mix_Chunk* sound)
 {
 #ifndef NOSOUND

Modified: branches/commonification/tuxmath/trunk/src/loaders.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/loaders.c	2009-08-05 19:49:27 UTC (rev 1374)
+++ branches/commonification/tuxmath/trunk/src/loaders.c	2009-08-05 19:49:54 UTC (rev 1375)
@@ -21,12 +21,12 @@
   Copyright: See COPYING file that comes with this distribution.
 */
 
-#ifndef HAVE_LIBT4KCOMMON
 
 #include "loaders.h"
 #include "globals.h"
 #include "SDL_extras.h"
 
+#ifndef HAVE_LIBT4KCOMMON
 #ifdef HAVE_RSVG
 #include<librsvg/rsvg.h>
 #include<librsvg/rsvg-cairo.h>

Modified: branches/commonification/tuxmath/trunk/src/loaders.h
===================================================================
--- branches/commonification/tuxmath/trunk/src/loaders.h	2009-08-05 19:49:27 UTC (rev 1374)
+++ branches/commonification/tuxmath/trunk/src/loaders.h	2009-08-05 19:49:54 UTC (rev 1375)
@@ -13,7 +13,6 @@
   Copyright: See COPYING file that comes with this distribution.
 */
 
-#ifndef HAVE_LIBT4KCOMMON
 #ifndef LOADERS_H
 #define LOADERS_H
 
@@ -27,6 +26,7 @@
 #include <sys/stat.h>
 #include <dirent.h>
 
+#ifndef HAVE_LIBT4KCOMMON
 
 #define IMG_REGULAR         0x01
 #define IMG_COLORKEY        0x02