--- a/src/audio/SDL_audio.c	Tue Jul 03 09:54:27 2007 +0000
+++ b/src/audio/SDL_audio.c	Tue Jul 03 09:55:29 2007 +0000
@@ -555,7 +555,7 @@
     switch (orig->channels) {
     case 0:{
             const char *env = SDL_getenv("SDL_AUDIO_CHANNELS");
-            if ((!env) || ((prepared->channels = (Uint8)SDL_atoi(env)) == 0)) {
+            if ((!env) || ((prepared->channels = (Uint8) SDL_atoi(env)) == 0)) {
                 prepared->channels = 2; /* a reasonable default */
             }
             break;

--- a/src/audio/arts/SDL_artsaudio.c	Tue Jul 03 09:54:27 2007 +0000
+++ b/src/audio/arts/SDL_artsaudio.c	Tue Jul 03 09:55:29 2007 +0000
@@ -57,7 +57,7 @@
 static int (*SDL_NAME(arts_write)) (arts_stream_t s, const void *buffer,
                                     int count);
 static void (*SDL_NAME(arts_close_stream)) (arts_stream_t s);
-static int (*SDL_NAME(arts_suspended))(void);
+static int (*SDL_NAME(arts_suspended)) (void);
 static const char *(*SDL_NAME(arts_error_text)) (int errorcode);
 
 #define SDL_ARTS_SYM(x) { #x, (void **) (char *) &SDL_NAME(x) }
@@ -66,16 +66,19 @@
     const char *name;
     void **func;
 } arts_functions[] = {
-SDL_ARTS_SYM(arts_init),
-        SDL_ARTS_SYM(arts_free),
-        SDL_ARTS_SYM(arts_play_stream),
-        SDL_ARTS_SYM(arts_stream_set),
-        SDL_ARTS_SYM(arts_stream_get),
-        SDL_ARTS_SYM(arts_write),
-        SDL_ARTS_SYM(arts_close_stream),
-        SDL_ARTS_SYM(arts_suspended),
-        SDL_ARTS_SYM(arts_error_text),
+/* *INDENT-OFF* */
+    SDL_ARTS_SYM(arts_init),
+    SDL_ARTS_SYM(arts_free),
+    SDL_ARTS_SYM(arts_play_stream),
+    SDL_ARTS_SYM(arts_stream_set),
+    SDL_ARTS_SYM(arts_stream_get),
+    SDL_ARTS_SYM(arts_write),
+    SDL_ARTS_SYM(arts_close_stream),
+    SDL_ARTS_SYM(arts_suspended),
+    SDL_ARTS_SYM(arts_error_text),
+/* *INDENT-ON* */
 };
+
 #undef SDL_ARTS_SYM
 
 static void
@@ -263,7 +266,7 @@
         return 0;
     }
 
-    if ( ! SDL_NAME(arts_suspended)() ) {
+    if (!SDL_NAME(arts_suspended) ()) {
         ARTS_CloseDevice(this);
         SDL_SetError("ARTS can not open audio device");
         return 0;
@@ -339,7 +342,7 @@
         }
 
         /* Play a stream so aRts doesn't crash */
-        if ( SDL_NAME(arts_suspended)() ) {
+        if (SDL_NAME(arts_suspended) ()) {
             arts_stream_t stream;
             stream = SDL_NAME(arts_play_stream) (44100, 16, 2, "SDL");
             SDL_NAME(arts_write) (stream, "", 0);

--- a/src/video/SDL_blit_A.c	Tue Jul 03 09:54:27 2007 +0000
+++ b/src/video/SDL_blit_A.c	Tue Jul 03 09:55:29 2007 +0000
@@ -35,12 +35,12 @@
 #    define MMX_ASMBLIT 1
 #    define GCC_ASMBLIT 1
 #  elif defined(_MSC_VER) && defined(_M_IX86)
-#    if (_MSC_VER <= 1200)  
-#      include <malloc.h>   
+#    if (_MSC_VER <= 1200)
+#      include <malloc.h>
 #      if defined(_mm_free)
 #          define HAVE_MMINTRIN_H 1
 #      endif
-#    else  /* Visual Studio > VC6 always has mmintrin.h */
+#    else /* Visual Studio > VC6 always has mmintrin.h */
 #      define HAVE_MMINTRIN_H 1
 #    endif
 #    if HAVE_MMINTRIN_H

--- a/src/video/win32/SDL_win32events.c	Tue Jul 03 09:54:27 2007 +0000
+++ b/src/video/win32/SDL_win32events.c	Tue Jul 03 09:55:29 2007 +0000
@@ -634,7 +634,7 @@
              *   DefWindowProc to process it.
              */
             if (xbuttonval > 0) {
-                return(TRUE);
+                return (TRUE);
             }
         }
         return (0);