diff options
author | tjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-05-22 03:46:11 +0000 |
---|---|---|
committer | tjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-05-22 03:46:11 +0000 |
commit | d28ebff56e669b04b2591f3e5b19f054d5fd955e (patch) | |
tree | 761c2cfc58c6af9019d7175573a597ce076db5a7 /code/SDL12/include/SDL_timer.h | |
parent | 33f302fec8eb69bc45451b1fb376b6a0b8ce0273 (diff) | |
download | ioquake3-aero-d28ebff56e669b04b2591f3e5b19f054d5fd955e.tar.gz ioquake3-aero-d28ebff56e669b04b2591f3e5b19f054d5fd955e.zip |
* updated the included libSDL header files and Mac OS X lib to SDL 1.2.11
git-svn-id: svn://svn.icculus.org/quake3/trunk@1089 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/SDL12/include/SDL_timer.h')
-rw-r--r-- | code/SDL12/include/SDL_timer.h | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/code/SDL12/include/SDL_timer.h b/code/SDL12/include/SDL_timer.h index d28c170..d21159f 100644 --- a/code/SDL12/include/SDL_timer.h +++ b/code/SDL12/include/SDL_timer.h @@ -1,37 +1,32 @@ /* SDL - Simple DirectMedia Layer - Copyright (C) 1997-2004 Sam Lantinga + Copyright (C) 1997-2006 Sam Lantinga This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_timer.h,v 1.7 2005/01/13 23:24:56 slouken Exp $"; -#endif - #ifndef _SDL_timer_h #define _SDL_timer_h /* Header for the SDL time management routines */ -#include "SDL_main.h" -#include "SDL_types.h" +#include "SDL_stdinc.h" +#include "SDL_error.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ |