(svn r23383) -Update: bring Squirrel to 2.2.5; besides some nice bug fixes, it mostly solves the sort() issues
This commit is contained in:
		
							
								
								
									
										17
									
								
								src/3rdparty/squirrel/include/squirrel.h
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										17
									
								
								src/3rdparty/squirrel/include/squirrel.h
									
									
									
									
										vendored
									
									
								
							@@ -1,5 +1,5 @@
 | 
			
		||||
/*
 | 
			
		||||
Copyright (c) 2003-2009 Alberto Demichelis
 | 
			
		||||
Copyright (c) 2003-2011 Alberto Demichelis
 | 
			
		||||
 | 
			
		||||
This software is provided 'as-is', without any
 | 
			
		||||
express or implied warranty. In no event will the
 | 
			
		||||
@@ -45,9 +45,11 @@ extern "C" {
 | 
			
		||||
#define SQUIRREL_API extern
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if (defined(_WIN64) || defined(_LP64)) && !defined(_SQ64)
 | 
			
		||||
#if (defined(_WIN64) || defined(_LP64))
 | 
			
		||||
#ifndef _SQ64
 | 
			
		||||
#define _SQ64
 | 
			
		||||
#endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef _SQ64
 | 
			
		||||
#ifdef _MSC_VER
 | 
			
		||||
@@ -78,13 +80,11 @@ typedef double SQFloat;
 | 
			
		||||
typedef float SQFloat;
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if defined(SQUSEDOUBLE) && !defined(_SQ64)
 | 
			
		||||
#if defined(SQUSEDOUBLE) && !defined(_SQ64) || !defined(SQUSEDOUBLE) && defined(_SQ64)
 | 
			
		||||
#ifdef _MSC_VER
 | 
			
		||||
typedef __int64 SQRawObjectVal; //must be 64bits
 | 
			
		||||
#elif defined(_WIN32)
 | 
			
		||||
typedef long long SQRawObjectVal; //must be 64bits
 | 
			
		||||
#else
 | 
			
		||||
typedef long SQRawObjectVal; //must be 64bits
 | 
			
		||||
typedef long long SQRawObjectVal; //must be 64bits
 | 
			
		||||
#endif
 | 
			
		||||
#define SQ_OBJECT_RAWINIT() { _unVal.raw = 0; }
 | 
			
		||||
#else
 | 
			
		||||
@@ -182,9 +182,10 @@ typedef char SQChar;
 | 
			
		||||
#define MAX_CHAR 0xFF
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#define SQUIRREL_VERSION	_SC("Squirrel 2.2.4 stable - With custom OpenTTD modifications")
 | 
			
		||||
#define SQUIRREL_COPYRIGHT	_SC("Copyright (C) 2003-2009 Alberto Demichelis")
 | 
			
		||||
#define SQUIRREL_VERSION	_SC("Squirrel 2.2.5 stable - With custom OpenTTD modifications")
 | 
			
		||||
#define SQUIRREL_COPYRIGHT	_SC("Copyright (C) 2003-2010 Alberto Demichelis")
 | 
			
		||||
#define SQUIRREL_AUTHOR		_SC("Alberto Demichelis")
 | 
			
		||||
#define SQUIRREL_VERSION_NUMBER	225
 | 
			
		||||
 | 
			
		||||
#define SQ_VMSTATE_IDLE			0
 | 
			
		||||
#define SQ_VMSTATE_RUNNING		1
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user