updating to SDL 1.2.13

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3823 e016b1c5-ed68-44aa-a2f7-31cac88cffde

source/include/SDL_image.h

@@ -38,7 +38,7 @@ extern "C" {
 */
 #define SDL_IMAGE_MAJOR_VERSION	1
 #define SDL_IMAGE_MINOR_VERSION	2
-#define SDL_IMAGE_PATCHLEVEL	6
+#define SDL_IMAGE_PATCHLEVEL	7
 
 /* This macro can be used to fill a version structure with the compile-time
  * version of the SDL_image library.

source/include/SDL_mixer.h

@@ -20,7 +20,7 @@
     [email protected]
 */
 
-/* $Id: SDL_mixer.h,v 1.3 2007-08-13 06:40:34 eihrul Exp $ */
+/* $Id: SDL_mixer.h,v 1.2 2007/08/12 09:32:55 eihrul Exp $ */
 
 #ifndef _SDL_MIXER_H
 #define _SDL_MIXER_H

source/include/SDL_mouse.h

@@ -122,9 +122,13 @@ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);
 #define SDL_BUTTON_RIGHT	3
 #define SDL_BUTTON_WHEELUP	4
 #define SDL_BUTTON_WHEELDOWN	5
+#define SDL_BUTTON_X1		6
+#define SDL_BUTTON_X2		7
 #define SDL_BUTTON_LMASK	SDL_BUTTON(SDL_BUTTON_LEFT)
 #define SDL_BUTTON_MMASK	SDL_BUTTON(SDL_BUTTON_MIDDLE)
 #define SDL_BUTTON_RMASK	SDL_BUTTON(SDL_BUTTON_RIGHT)
+#define SDL_BUTTON_X1MASK	SDL_BUTTON(SDL_BUTTON_X1)
+#define SDL_BUTTON_X2MASK	SDL_BUTTON(SDL_BUTTON_X2)
 
 
 /* Ends C function definitions when using C++ */

source/include/SDL_stdinc.h

@@ -174,6 +174,8 @@ extern DECLSPEC void SDLCALL SDL_free(void *mem);
 #  define alloca _alloca
 # elif defined(__WATCOMC__)
 #  include <malloc.h>
+# elif defined(__BORLANDC__)
+#  include <malloc.h>
 # elif defined(__DMC__)
 #  include <stdlib.h>
 # elif defined(__AIX__)

source/include/SDL_version.h

@@ -37,7 +37,7 @@ extern "C" {
 */
 #define SDL_MAJOR_VERSION	1
 #define SDL_MINOR_VERSION	2
-#define SDL_PATCHLEVEL		12
+#define SDL_PATCHLEVEL		13
 
 typedef struct SDL_version {
 	Uint8 major;

source/include/begin_code.h

@@ -90,8 +90,8 @@
 #elif !defined(__WINS__)
 #undef DECLSPEC
 #define DECLSPEC __declspec(dllexport)
-#endif //EKA2
-#endif //__SYMBIAN32__
+#endif /* !EKA2 */
+#endif /* __SYMBIAN32__ */
 
 /* Force structure packing at 4 byte alignment.
    This is necessary if the header is included in code which has structure

source/include/zconf.h

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id: zconf.h,v 1.3 2007-08-13 06:40:34 eihrul Exp $ */
+/* @(#) $Id: zconf.h,v 1.2 2006/09/11 19:19:13 aardappel Exp $ */
 
 #ifndef ZCONF_H
 #define ZCONF_H