* Merge of ioq3-r1112

1 files changed, 17 insertions, 20 deletions

diff --git a/src/SDL12/include/SDL_cpuinfo.h b/src/SDL12/include/SDL_cpuinfo.h
index f9332b4a..72acbdd8 100644
--- a/src/SDL12/include/SDL_cpuinfo.h
+++ b/src/SDL12/include/SDL_cpuinfo.h
@@ -1,36 +1,33 @@
 /*
     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_cpuinfo.h,v 1.5 2004/01/24 05:47:18 slouken Exp $";
-#endif
-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /* CPU feature detection for SDL                                       */
 
 #ifndef _SDL_cpuinfo_h
 #define _SDL_cpuinfo_h
 
+#include "SDL_stdinc.h"
+
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -39,35 +36,35 @@ extern "C" {
 
 /* This function returns true if the CPU has the RDTSC instruction
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC();
+extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC(void);
 
 /* This function returns true if the CPU has MMX features
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX();
+extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void);
 
 /* This function returns true if the CPU has MMX Ext. features
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasMMXExt();
+extern DECLSPEC SDL_bool SDLCALL SDL_HasMMXExt(void);
 
 /* This function returns true if the CPU has 3DNow features
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow();
+extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void);
 
 /* This function returns true if the CPU has 3DNow! Ext. features
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNowExt();
+extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNowExt(void);
 
 /* This function returns true if the CPU has SSE features
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE();
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void);
 
 /* This function returns true if the CPU has SSE2 features
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2();
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void);
 
 /* This function returns true if the CPU has AltiVec features
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec();
+extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void);
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus