Backout hg changset 898992405fa7; lots of things still use SDL_types.h. :/
authorRyan C. Gordon <icculus@icculus.org>
Tue, 09 Jul 2013 11:57:32 -0400
changeset 738785303f85cb70
parent 7386 ff3af8304053
child 7388 058097637b4c
Backout hg changset 898992405fa7; lots of things still use SDL_types.h. :/

Will remove this again at some point in the future, though.
Makefile.in
VisualC/SDL/SDL_VS2008.vcproj
VisualC/SDL/SDL_VS2010.vcxproj
VisualC/SDL/SDL_VS2012.vcxproj
Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj
Xcode/SDL/SDL.xcodeproj/project.pbxproj
include/SDL_types.h
src/joystick/iphoneos/SDLUIAccelerationDelegate.h
     1.1 --- a/Makefile.in	Tue Jul 09 08:01:40 2013 -0700
     1.2 +++ b/Makefile.in	Tue Jul 09 11:57:32 2013 -0400
     1.3 @@ -87,6 +87,7 @@
     1.4  	SDL_thread.h \
     1.5  	SDL_timer.h \
     1.6  	SDL_touch.h \
     1.7 +	SDL_types.h \
     1.8  	SDL_version.h \
     1.9  	SDL_video.h \
    1.10  	begin_code.h \
     2.1 --- a/VisualC/SDL/SDL_VS2008.vcproj	Tue Jul 09 08:01:40 2013 -0700
     2.2 +++ b/VisualC/SDL/SDL_VS2008.vcproj	Tue Jul 09 11:57:32 2013 -0400
     2.3 @@ -560,6 +560,10 @@
     2.4  				>
     2.5  			</File>
     2.6  			<File
     2.7 +				RelativePath="..\..\include\SDL_types.h"
     2.8 +				>
     2.9 +			</File>
    2.10 +			<File
    2.11  				RelativePath="..\..\include\SDL_version.h"
    2.12  				>
    2.13  			</File>
     3.1 --- a/VisualC/SDL/SDL_VS2010.vcxproj	Tue Jul 09 08:01:40 2013 -0700
     3.2 +++ b/VisualC/SDL/SDL_VS2010.vcxproj	Tue Jul 09 11:57:32 2013 -0400
     3.3 @@ -261,6 +261,7 @@
     3.4      <ClInclude Include="..\..\include\SDL_thread.h" />
     3.5      <ClInclude Include="..\..\include\SDL_timer.h" />
     3.6      <ClInclude Include="..\..\include\SDL_touch.h" />
     3.7 +    <ClInclude Include="..\..\include\SDL_types.h" />
     3.8      <ClInclude Include="..\..\include\SDL_version.h" />
     3.9      <ClInclude Include="..\..\include\SDL_video.h" />
    3.10      <ClInclude Include="..\..\src\core\windows\SDL_windows.h" />
     4.1 --- a/VisualC/SDL/SDL_VS2012.vcxproj	Tue Jul 09 08:01:40 2013 -0700
     4.2 +++ b/VisualC/SDL/SDL_VS2012.vcxproj	Tue Jul 09 11:57:32 2013 -0400
     4.3 @@ -264,6 +264,7 @@
     4.4      <ClInclude Include="..\..\include\SDL_thread.h" />
     4.5      <ClInclude Include="..\..\include\SDL_timer.h" />
     4.6      <ClInclude Include="..\..\include\SDL_touch.h" />
     4.7 +    <ClInclude Include="..\..\include\SDL_types.h" />
     4.8      <ClInclude Include="..\..\include\SDL_version.h" />
     4.9      <ClInclude Include="..\..\include\SDL_video.h" />
    4.10      <ClInclude Include="..\..\include\SDL_gamecontroller.h" />
     5.1 --- a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj	Tue Jul 09 08:01:40 2013 -0700
     5.2 +++ b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj	Tue Jul 09 11:57:32 2013 -0400
     5.3 @@ -128,6 +128,7 @@
     5.4  		AA7558C41595D55500BBD41B /* SDL_thread.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7558911595D55500BBD41B /* SDL_thread.h */; };
     5.5  		AA7558C51595D55500BBD41B /* SDL_timer.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7558921595D55500BBD41B /* SDL_timer.h */; };
     5.6  		AA7558C61595D55500BBD41B /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7558931595D55500BBD41B /* SDL_touch.h */; };
     5.7 +		AA7558C71595D55500BBD41B /* SDL_types.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7558941595D55500BBD41B /* SDL_types.h */; };
     5.8  		AA7558C81595D55500BBD41B /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7558951595D55500BBD41B /* SDL_version.h */; };
     5.9  		AA7558C91595D55500BBD41B /* SDL_video.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7558961595D55500BBD41B /* SDL_video.h */; };
    5.10  		AA7558CA1595D55500BBD41B /* SDL.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7558971595D55500BBD41B /* SDL.h */; };
    5.11 @@ -319,6 +320,7 @@
    5.12  		AA7558911595D55500BBD41B /* SDL_thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_thread.h; sourceTree = "<group>"; };
    5.13  		AA7558921595D55500BBD41B /* SDL_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_timer.h; sourceTree = "<group>"; };
    5.14  		AA7558931595D55500BBD41B /* SDL_touch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_touch.h; sourceTree = "<group>"; };
    5.15 +		AA7558941595D55500BBD41B /* SDL_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_types.h; sourceTree = "<group>"; };
    5.16  		AA7558951595D55500BBD41B /* SDL_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_version.h; sourceTree = "<group>"; };
    5.17  		AA7558961595D55500BBD41B /* SDL_video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_video.h; sourceTree = "<group>"; };
    5.18  		AA7558971595D55500BBD41B /* SDL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL.h; sourceTree = "<group>"; };
    5.19 @@ -711,6 +713,7 @@
    5.20  				AA7558911595D55500BBD41B /* SDL_thread.h */,
    5.21  				AA7558921595D55500BBD41B /* SDL_timer.h */,
    5.22  				AA7558931595D55500BBD41B /* SDL_touch.h */,
    5.23 +				AA7558941595D55500BBD41B /* SDL_types.h */,
    5.24  				AA7558951595D55500BBD41B /* SDL_version.h */,
    5.25  				AA7558961595D55500BBD41B /* SDL_video.h */,
    5.26  			);
    5.27 @@ -1011,6 +1014,7 @@
    5.28  				AA7558C41595D55500BBD41B /* SDL_thread.h in Headers */,
    5.29  				AA7558C51595D55500BBD41B /* SDL_timer.h in Headers */,
    5.30  				AA7558C61595D55500BBD41B /* SDL_touch.h in Headers */,
    5.31 +				AA7558C71595D55500BBD41B /* SDL_types.h in Headers */,
    5.32  				AA7558C81595D55500BBD41B /* SDL_version.h in Headers */,
    5.33  				AA7558C91595D55500BBD41B /* SDL_video.h in Headers */,
    5.34  				AA7558CA1595D55500BBD41B /* SDL.h in Headers */,
     6.1 --- a/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj	Tue Jul 09 08:01:40 2013 -0700
     6.2 +++ b/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj	Tue Jul 09 11:57:32 2013 -0400
     6.3 @@ -75,6 +75,7 @@
     6.4  		0097E2CE12F70C4D00724AC5 /* SDL_thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_thread.h; sourceTree = "<group>"; };
     6.5  		0097E2CF12F70C4D00724AC5 /* SDL_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_timer.h; sourceTree = "<group>"; };
     6.6  		0097E2D012F70C4D00724AC5 /* SDL_touch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_touch.h; sourceTree = "<group>"; };
     6.7 +		0097E2D112F70C4D00724AC5 /* SDL_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_types.h; sourceTree = "<group>"; };
     6.8  		0097E2D212F70C4D00724AC5 /* SDL_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_version.h; sourceTree = "<group>"; };
     6.9  		0097E2D312F70C4D00724AC5 /* SDL_video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_video.h; sourceTree = "<group>"; };
    6.10  		0097E2D512F70C4D00724AC5 /* libSDL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libSDL.a; sourceTree = "<group>"; };
    6.11 @@ -177,6 +178,7 @@
    6.12  				0097E2CE12F70C4D00724AC5 /* SDL_thread.h */,
    6.13  				0097E2CF12F70C4D00724AC5 /* SDL_timer.h */,
    6.14  				0097E2D012F70C4D00724AC5 /* SDL_touch.h */,
    6.15 +				0097E2D112F70C4D00724AC5 /* SDL_types.h */,
    6.16  				0097E2D212F70C4D00724AC5 /* SDL_version.h */,
    6.17  				0097E2D312F70C4D00724AC5 /* SDL_video.h */,
    6.18  			);
     7.1 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Tue Jul 09 08:01:40 2013 -0700
     7.2 +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Tue Jul 09 11:57:32 2013 -0400
     7.3 @@ -499,6 +499,8 @@
     7.4  		AA7558551595D4D800BBD41B /* SDL_timer.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F41595D4D800BBD41B /* SDL_timer.h */; };
     7.5  		AA7558561595D4D800BBD41B /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F51595D4D800BBD41B /* SDL_touch.h */; settings = {ATTRIBUTES = (Public, ); }; };
     7.6  		AA7558571595D4D800BBD41B /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F51595D4D800BBD41B /* SDL_touch.h */; };
     7.7 +		AA7558581595D4D800BBD41B /* SDL_types.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F61595D4D800BBD41B /* SDL_types.h */; settings = {ATTRIBUTES = (Public, ); }; };
     7.8 +		AA7558591595D4D800BBD41B /* SDL_types.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F61595D4D800BBD41B /* SDL_types.h */; };
     7.9  		AA75585A1595D4D800BBD41B /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F71595D4D800BBD41B /* SDL_version.h */; settings = {ATTRIBUTES = (Public, ); }; };
    7.10  		AA75585B1595D4D800BBD41B /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F71595D4D800BBD41B /* SDL_version.h */; };
    7.11  		AA75585C1595D4D800BBD41B /* SDL_video.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F81595D4D800BBD41B /* SDL_video.h */; settings = {ATTRIBUTES = (Public, ); }; };
    7.12 @@ -645,6 +647,7 @@
    7.13  		DB313FF317554B71006C0E22 /* SDL_thread.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F31595D4D800BBD41B /* SDL_thread.h */; };
    7.14  		DB313FF417554B71006C0E22 /* SDL_timer.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F41595D4D800BBD41B /* SDL_timer.h */; };
    7.15  		DB313FF517554B71006C0E22 /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F51595D4D800BBD41B /* SDL_touch.h */; };
    7.16 +		DB313FF617554B71006C0E22 /* SDL_types.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F61595D4D800BBD41B /* SDL_types.h */; };
    7.17  		DB313FF717554B71006C0E22 /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F71595D4D800BBD41B /* SDL_version.h */; };
    7.18  		DB313FF817554B71006C0E22 /* SDL_video.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F81595D4D800BBD41B /* SDL_video.h */; };
    7.19  		DB313FF917554B71006C0E22 /* SDL.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F91595D4D800BBD41B /* SDL.h */; };
    7.20 @@ -1031,6 +1034,7 @@
    7.21  		AA7557F31595D4D800BBD41B /* SDL_thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_thread.h; sourceTree = "<group>"; };
    7.22  		AA7557F41595D4D800BBD41B /* SDL_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_timer.h; sourceTree = "<group>"; };
    7.23  		AA7557F51595D4D800BBD41B /* SDL_touch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_touch.h; sourceTree = "<group>"; };
    7.24 +		AA7557F61595D4D800BBD41B /* SDL_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_types.h; sourceTree = "<group>"; };
    7.25  		AA7557F71595D4D800BBD41B /* SDL_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_version.h; sourceTree = "<group>"; };
    7.26  		AA7557F81595D4D800BBD41B /* SDL_video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_video.h; sourceTree = "<group>"; };
    7.27  		AA7557F91595D4D800BBD41B /* SDL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL.h; sourceTree = "<group>"; };
    7.28 @@ -1159,6 +1163,7 @@
    7.29  				AA7557F31595D4D800BBD41B /* SDL_thread.h */,
    7.30  				AA7557F41595D4D800BBD41B /* SDL_timer.h */,
    7.31  				AA7557F51595D4D800BBD41B /* SDL_touch.h */,
    7.32 +				AA7557F61595D4D800BBD41B /* SDL_types.h */,
    7.33  				AA7557F71595D4D800BBD41B /* SDL_version.h */,
    7.34  				AA7557F81595D4D800BBD41B /* SDL_video.h */,
    7.35  			);
    7.36 @@ -1752,6 +1757,7 @@
    7.37  				AA7558521595D4D800BBD41B /* SDL_thread.h in Headers */,
    7.38  				AA7558541595D4D800BBD41B /* SDL_timer.h in Headers */,
    7.39  				AA7558561595D4D800BBD41B /* SDL_touch.h in Headers */,
    7.40 +				AA7558581595D4D800BBD41B /* SDL_types.h in Headers */,
    7.41  				AA75585A1595D4D800BBD41B /* SDL_version.h in Headers */,
    7.42  				AA75585C1595D4D800BBD41B /* SDL_video.h in Headers */,
    7.43  				AA75585E1595D4D800BBD41B /* SDL.h in Headers */,
    7.44 @@ -1979,6 +1985,7 @@
    7.45  				AA7558531595D4D800BBD41B /* SDL_thread.h in Headers */,
    7.46  				AA7558551595D4D800BBD41B /* SDL_timer.h in Headers */,
    7.47  				AA7558571595D4D800BBD41B /* SDL_touch.h in Headers */,
    7.48 +				AA7558591595D4D800BBD41B /* SDL_types.h in Headers */,
    7.49  				AA75585B1595D4D800BBD41B /* SDL_version.h in Headers */,
    7.50  				AA75585D1595D4D800BBD41B /* SDL_video.h in Headers */,
    7.51  				AA75585F1595D4D800BBD41B /* SDL.h in Headers */,
    7.52 @@ -2122,6 +2129,7 @@
    7.53  				DB313FF317554B71006C0E22 /* SDL_thread.h in Headers */,
    7.54  				DB313FF417554B71006C0E22 /* SDL_timer.h in Headers */,
    7.55  				DB313FF517554B71006C0E22 /* SDL_touch.h in Headers */,
    7.56 +				DB313FF617554B71006C0E22 /* SDL_types.h in Headers */,
    7.57  				DB313FF717554B71006C0E22 /* SDL_version.h in Headers */,
    7.58  				DB313FF817554B71006C0E22 /* SDL_video.h in Headers */,
    7.59  				DB313FF917554B71006C0E22 /* SDL.h in Headers */,
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/include/SDL_types.h	Tue Jul 09 11:57:32 2013 -0400
     8.3 @@ -0,0 +1,29 @@
     8.4 +/*
     8.5 +  Simple DirectMedia Layer
     8.6 +  Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
     8.7 +
     8.8 +  This software is provided 'as-is', without any express or implied
     8.9 +  warranty.  In no event will the authors be held liable for any damages
    8.10 +  arising from the use of this software.
    8.11 +
    8.12 +  Permission is granted to anyone to use this software for any purpose,
    8.13 +  including commercial applications, and to alter it and redistribute it
    8.14 +  freely, subject to the following restrictions:
    8.15 +
    8.16 +  1. The origin of this software must not be misrepresented; you must not
    8.17 +     claim that you wrote the original software. If you use this software
    8.18 +     in a product, an acknowledgment in the product documentation would be
    8.19 +     appreciated but is not required.
    8.20 +  2. Altered source versions must be plainly marked as such, and must not be
    8.21 +     misrepresented as being the original software.
    8.22 +  3. This notice may not be removed or altered from any source distribution.
    8.23 +*/
    8.24 +
    8.25 +/**
    8.26 + *  \file SDL_types.h
    8.27 + *
    8.28 + *  \deprecated
    8.29 + */
    8.30 +
    8.31 +/* DEPRECATED */
    8.32 +#include "SDL_stdinc.h"
     9.1 --- a/src/joystick/iphoneos/SDLUIAccelerationDelegate.h	Tue Jul 09 08:01:40 2013 -0700
     9.2 +++ b/src/joystick/iphoneos/SDLUIAccelerationDelegate.h	Tue Jul 09 11:57:32 2013 -0400
     9.3 @@ -20,7 +20,7 @@
     9.4  */
     9.5  
     9.6  #import <UIKit/UIKit.h>
     9.7 -#include "SDL_stdinc.h"
     9.8 +#import <SDL_types.h>
     9.9  
    9.10  /* *INDENT-OFF* */
    9.11  @interface SDLUIAccelerationDelegate: NSObject <UIAccelerometerDelegate> {