Merge from https://bitbucket.org/keestux/sdl ... SDL_gesture code cle…

…anup.

include/SDL_clipboard.h

@@ -55,7 +55,7 @@ extern DECLSPEC int SDLCALL SDL_SetClipboardText(const char *text);
 extern DECLSPEC char * SDLCALL SDL_GetClipboardText(void);
 
 /**
- * \brief Returns whether the clipboard has text
+ * \brief Returns a flag indicating whether the clipboard exists and contains a text string that it non-empty
  *
  * \sa SDL_GetClipboardText()
  */

include/SDL_config.h.in

@@ -233,7 +233,6 @@
 #undef SDL_THREAD_PTHREAD
 #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX
 #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP
-#undef SDL_THREAD_SPROC
 #undef SDL_THREAD_WINDOWS
 
 /* Enable various timer systems */

include/SDL_events.h

@@ -280,7 +280,7 @@ typedef struct SDL_JoyButtonEvent
 
 
 /**
- *  \brief Touch finger motion/finger event structure (event.tmotion.*)
+ *  \brief Touch finger motion/finger event structure (event.tfinger.*)
  */
 typedef struct SDL_TouchFingerEvent
 {
@@ -302,7 +302,7 @@ typedef struct SDL_TouchFingerEvent
 
 
 /**
- *  \brief Touch finger motion/finger event structure (event.tmotion.*)
+ *  \brief Touch finger motion/finger event structure (event.tbutton.*)
  */
 typedef struct SDL_TouchButtonEvent
 {

include/SDL_log.h

@@ -121,7 +121,7 @@ extern DECLSPEC void SDLCALL SDL_LogSetPriority(int category,
                                                 SDL_LogPriority priority);
 
 /**
- *  \brief Set the priority of a particular log category
+ *  \brief Get the priority of a particular log category
  */
 extern DECLSPEC SDL_LogPriority SDLCALL SDL_LogGetPriority(int category);
 

include/SDL_opengl.h

@@ -30,6 +30,8 @@
 
 #include "SDL_config.h"
 
+#ifndef __IPHONEOS__
+
 #ifdef __WIN32__
 #define WIN32_LEAN_AND_MEAN
 #ifndef NOMINMAX
 /* *INDENT-ON* */
 #endif /* NO_SDL_GLEXT */
 
+#endif /* !__IPHONEOS__ */
+
 #endif /* _SDL_opengl_h */
 
 /* vi: set ts=4 sw=4 expandtab: */

include/SDL_render.h

@@ -389,7 +389,7 @@ extern DECLSPEC void SDLCALL SDL_RenderGetViewport(SDL_Renderer * renderer,
                                                    SDL_Rect * rect);
 
 /**
- *  \brief Set the color used for drawing operations (Fill and Line).
+ *  \brief Set the color used for drawing operations (Rect, Line and Clear).
  *  
  *  \param r The red value used to draw on the rendering target.
  *  \param g The green value used to draw on the rendering target.
@@ -404,7 +404,7 @@ extern DECLSPEC int SDL_SetRenderDrawColor(SDL_Renderer * renderer,
                                            Uint8 a);
 
 /**
- *  \brief Get the color used for drawing operations (Fill and Line).
+ *  \brief Get the color used for drawing operations (Rect, Line and Clear).
  *  
  *  \param r A pointer to the red value used to draw on the rendering target.
  *  \param g A pointer to the green value used to draw on the rendering target.

include/SDL_surface.h

@@ -355,6 +355,8 @@ extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurfaceFormat
 
 /**
  * \brief Copy a block of pixels of one format to another format
+ *  
+ *  \return 0 on success, or -1 if there was an error
  */
 extern DECLSPEC int SDLCALL SDL_ConvertPixels(int width, int height,
                                               Uint32 src_format,

src/SDL_assert.c

@@ -319,7 +319,7 @@ SDL_PromptAssertion(const SDL_assert_data *data, void *userdata)
 #ifdef __WIN32__
     state = SDL_PromptAssertion_windows(data);
 
-#elif __MACOSX__
+#elif defined __MACOSX__ && defined SDL_VIDEO_DRIVER_COCOA
     /* This has to be done in an Objective-C (*.m) file, so we call out. */
     extern SDL_assert_state SDL_PromptAssertion_cocoa(const SDL_assert_data *);
     state = SDL_PromptAssertion_cocoa(data);

src/SDL_error_c.h

@@ -56,6 +56,9 @@ typedef struct SDL_error
     } args[ERR_MAX_ARGS];
 } SDL_error;
 
+/* Defined in SDL_thread.c */
+extern SDL_error *SDL_GetErrBuf(void);
+
 #endif /* _SDL_error_c_h */
 
 /* vi: set ts=4 sw=4 expandtab: */

src/SDL_log.c

@@ -258,7 +258,7 @@ SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list
     }
 
     /* Make sure we don't exceed array bounds */
-    if (priority < 0 || priority >= SDL_NUM_LOG_PRIORITIES) {
+    if ((int)priority < 0 || priority >= SDL_NUM_LOG_PRIORITIES) {
         return;
     }
 

src/audio/alsa/SDL_alsa_audio.c

@@ -20,6 +20,8 @@
 */
 #include "SDL_config.h"
 
+#if SDL_AUDIO_DRIVER_ALSA
+
 /* Allow access to a raw mixing buffer */
 
 #include <sys/types.h>
@@ -693,4 +695,6 @@ AudioBootStrap ALSA_bootstrap = {
     "alsa", "ALSA PCM audio", ALSA_Init, 0
 };
 
+#endif /* SDL_AUDIO_DRIVER_ALSA */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/android/SDL_androidaudio.c

@@ -20,6 +20,8 @@
 */
 #include "SDL_config.h"
 
+#if SDL_AUDIO_DRIVER_ANDROID
+
 /* Output audio to Android */
 
 #include "SDL_audio.h"
@@ -154,4 +156,6 @@ Android_RunAudioThread()
 	SDL_RunAudio(audioDevice);
 }
 
+#endif /* SDL_AUDIO_DRIVER_ANDROID */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/arts/SDL_artsaudio.c

@@ -20,6 +20,8 @@
 */
 #include "SDL_config.h"
 
+#if SDL_AUDIO_DRIVER_ARTS
+
 /* Allow access to a raw mixing buffer */
 
 #ifdef HAVE_SIGNAL_H
@@ -372,4 +374,6 @@ AudioBootStrap ARTS_bootstrap = {
     "arts", "Analog RealTime Synthesizer", ARTS_Init, 0
 };
 
+#endif /* SDL_AUDIO_DRIVER_ARTS */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/baudio/SDL_beaudio.cc

@@ -20,6 +20,8 @@
 */
 #include "SDL_config.h"
 
+#if SDL_AUDIO_DRIVER_BEOSAUDIO
+
 /* Allow access to the audio stream on BeOS */
 
 #include <SoundPlayer.h>
@@ -214,4 +216,6 @@ AudioBootStrap BEOSAUDIO_bootstrap = {
     "baudio", "BeOS BSoundPlayer", BEOSAUDIO_Init, 0
 };
 
+#endif /* SDL_AUDIO_DRIVER_BEOSAUDIO */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/bsd/SDL_bsdaudio.c

@@ -20,6 +20,8 @@
 */
 #include "SDL_config.h"
 
+#if SDL_AUDIO_DRIVER_BSD
+
 /*
  * Driver for native OpenBSD/NetBSD audio(4).
  * vedge@vedge.com.ar.
@@ -364,4 +366,6 @@ AudioBootStrap BSD_AUDIO_bootstrap = {
     "bsd", "BSD audio", BSDAUDIO_Init, 0
 };
 
+#endif /* SDL_AUDIO_DRIVER_BSD */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/directsound/SDL_directsound.c

@@ -20,6 +20,8 @@
 */
 #include "SDL_config.h"
 
+#if SDL_AUDIO_DRIVER_DSOUND
+
 /* Allow access to a raw mixing buffer */
 
 #include "SDL_timer.h"
@@ -549,4 +551,6 @@ AudioBootStrap DSOUND_bootstrap = {
     "directsound", "DirectSound", DSOUND_Init, 0
 };
 
+#endif /* SDL_AUDIO_DRIVER_DSOUND */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/disk/SDL_diskaudio.c

@@ -20,6 +20,8 @@
 */
 #include "SDL_config.h"
 
+#if SDL_AUDIO_DRIVER_DISK
+
 /* Output raw audio data to a file. */
 
 #if HAVE_STDIO_H
@@ -159,4 +161,6 @@ AudioBootStrap DISKAUD_bootstrap = {
     "disk", "direct-to-disk audio", DISKAUD_Init, 1
 };
 
+#endif /* SDL_AUDIO_DRIVER_DISK */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/dsp/SDL_dspaudio.c

@@ -20,6 +20,8 @@
 */
 #include "SDL_config.h"
 
+#if SDL_AUDIO_DRIVER_OSS
+
 /* Allow access to a raw mixing buffer */
 
 #include <stdio.h>              /* For perror() */
@@ -312,4 +314,6 @@ AudioBootStrap DSP_bootstrap = {
     "dsp", "OSS /dev/dsp standard audio", DSP_Init, 0
 };
 
+#endif /* SDL_AUDIO_DRIVER_OSS */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/esd/SDL_esdaudio.c

@@ -20,6 +20,8 @@
 */
 #include "SDL_config.h"
 
+#if SDL_AUDIO_DRIVER_ESD
+
 /* Allow access to an ESD network stream mixing buffer */
 
 #include <sys/types.h>
@@ -345,4 +347,6 @@ AudioBootStrap ESD_bootstrap = {
     "esd", "Enlightened Sound Daemon", ESD_Init, 0
 };
 
+#endif /* SDL_AUDIO_DRIVER_ESD */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/fusionsound/SDL_fsaudio.c

@@ -20,6 +20,8 @@
 */
 #include "SDL_config.h"
 
+#if SDL_AUDIO_DRIVER_FUSIONSOUND
+
 /* Allow access to a raw mixing buffer */
 
 #ifdef HAVE_SIGNAL_H
@@ -345,4 +347,6 @@ AudioBootStrap FUSIONSOUND_bootstrap = {
     "fusionsound", "FusionSound", SDL_FS_Init, 0
 };
 
+#endif /* SDL_AUDIO_DRIVER_FUSIONSOUND */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/nas/SDL_nasaudio.c

@@ -20,6 +20,8 @@
 */
 #include "SDL_config.h"
 
+#if SDL_AUDIO_DRIVER_NAS
+
 /* Allow access to a raw mixing buffer */
 
 #include <signal.h>
@@ -397,4 +399,6 @@ AudioBootStrap NAS_bootstrap = {
     "nas", "Network Audio System", NAS_Init, 0
 };
 
+#endif /* SDL_AUDIO_DRIVER_NAS */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/nds/SDL_ndsaudio.c

@@ -20,6 +20,8 @@
 */
 #include "SDL_config.h"
 
+#if SDL_AUDIO_DRIVER_NDS
+
 /* Output audio to NDS */
 
 #include <nds.h>
@@ -122,4 +124,6 @@ AudioBootStrap NDSAUD_bootstrap = {
     "nds", "SDL NDS audio driver", NDSAUD_Init, 0       /*1? */
 };
 
+#endif /* SDL_AUDIO_DRIVER_NDS */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/paudio/SDL_paudio.c

@@ -20,6 +20,8 @@
 */
 #include "SDL_config.h"
 
+#if SDL_AUDIO_DRIVER_PAUDIO
+
 /* Allow access to a raw mixing buffer */
 
 #include <errno.h>
@@ -545,4 +547,6 @@ AudioBootStrap PAUDIO_bootstrap = {
     "paud", "AIX Paudio", PAUDIO_Init, 0
 };
 
+#endif /* SDL_AUDIO_DRIVER_PAUDIO */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/qsa/SDL_qsa_audio.c

@@ -21,6 +21,8 @@
 
 #include "SDL_config.h"
 
+#if SDL_AUDIO_DRIVER_QSA
+
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -863,4 +865,6 @@ AudioBootStrap QSAAUDIO_bootstrap = {
     "qsa", "QNX QSA Audio", QSA_Init, 0
 };
 
+#endif /* SDL_AUDIO_DRIVER_QSA */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/sun/SDL_sunaudio.c

@@ -1,8 +1,3 @@
-/* I'm gambling no one uses this audio backend...we'll see who emails.  :)  */
-#error this code has not been updated for SDL 1.3.
-#error if no one emails icculus at icculus.org and tells him that this
-#error  code is needed, this audio backend will eventually be removed from SDL.
-
 /*
   Simple DirectMedia Layer
   Copyright (C) 1997-2011 Sam Lantinga <slouken@libsdl.org>
@@ -25,6 +20,13 @@
 */
 #include "SDL_config.h"
 
+#if SDL_AUDIO_DRIVER_SUNAUDIO
+
+/* I'm gambling no one uses this audio backend...we'll see who emails.  :)  */
+#error this code has not been updated for SDL 1.3.
+#error if no one emails icculus at icculus.org and tells him that this
+#error  code is needed, this audio backend will eventually be removed from SDL.
+
 /* Allow access to a raw mixing buffer */
 
 #include <fcntl.h>
@@ -450,4 +452,6 @@ snd2au(int sample)
     return (mask & sample);
 }
 
+#endif /* SDL_AUDIO_DRIVER_SUNAUDIO */
+
 /* vi: set ts=4 sw=4 expandtab: */