From ed365a33c0e20ef215b41103b32d43d5f1ee4797 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 6 Sep 2014 20:05:07 +0000 Subject: [PATCH] (svn r26779) -Cleanup [Squirrel]: remove extern "C" statements; we won't be exporting things to C from our squirrel --- src/3rdparty/squirrel/include/sqstdaux.h | 8 -------- src/3rdparty/squirrel/include/sqstdblob.h | 8 -------- src/3rdparty/squirrel/include/sqstdio.h | 9 --------- src/3rdparty/squirrel/include/sqstdmath.h | 8 -------- src/3rdparty/squirrel/include/sqstdstring.h | 8 -------- src/3rdparty/squirrel/include/sqstdsystem.h | 8 -------- src/3rdparty/squirrel/include/squirrel.h | 8 -------- 7 files changed, 57 deletions(-) diff --git a/src/3rdparty/squirrel/include/sqstdaux.h b/src/3rdparty/squirrel/include/sqstdaux.h index c16b04373b..e11c9a0742 100644 --- a/src/3rdparty/squirrel/include/sqstdaux.h +++ b/src/3rdparty/squirrel/include/sqstdaux.h @@ -2,15 +2,7 @@ #ifndef _SQSTD_AUXLIB_H_ #define _SQSTD_AUXLIB_H_ -#ifdef __cplusplus -extern "C" { -#endif - SQUIRREL_API void sqstd_seterrorhandlers(HSQUIRRELVM v); SQUIRREL_API void sqstd_printcallstack(HSQUIRRELVM v); -#ifdef __cplusplus -} /*extern "C"*/ -#endif - #endif /* _SQSTD_AUXLIB_H_ */ diff --git a/src/3rdparty/squirrel/include/sqstdblob.h b/src/3rdparty/squirrel/include/sqstdblob.h index 1d9a4cdc38..11851a3cd9 100644 --- a/src/3rdparty/squirrel/include/sqstdblob.h +++ b/src/3rdparty/squirrel/include/sqstdblob.h @@ -2,19 +2,11 @@ #ifndef _SQSTDBLOB_H_ #define _SQSTDBLOB_H_ -#ifdef __cplusplus -extern "C" { -#endif - SQUIRREL_API SQUserPointer sqstd_createblob(HSQUIRRELVM v, SQInteger size); SQUIRREL_API SQRESULT sqstd_getblob(HSQUIRRELVM v,SQInteger idx,SQUserPointer *ptr); SQUIRREL_API SQInteger sqstd_getblobsize(HSQUIRRELVM v,SQInteger idx); SQUIRREL_API SQRESULT sqstd_register_bloblib(HSQUIRRELVM v); -#ifdef __cplusplus -} /*extern "C"*/ -#endif - #endif /*_SQSTDBLOB_H_*/ diff --git a/src/3rdparty/squirrel/include/sqstdio.h b/src/3rdparty/squirrel/include/sqstdio.h index 5eaec31c6d..094d7c2443 100644 --- a/src/3rdparty/squirrel/include/sqstdio.h +++ b/src/3rdparty/squirrel/include/sqstdio.h @@ -2,8 +2,6 @@ #ifndef _SQSTDIO_H_ #define _SQSTDIO_H_ -#ifdef __cplusplus - #define SQSTD_STREAM_TYPE_TAG 0x80000000 struct SQStream { @@ -18,9 +16,6 @@ struct SQStream { virtual bool EOS() = 0; }; -extern "C" { -#endif - #define SQ_SEEK_CUR 0 #define SQ_SEEK_END 1 #define SQ_SEEK_SET 2 @@ -46,9 +41,5 @@ SQUIRREL_API SQRESULT sqstd_writeclosuretofile(HSQUIRRELVM v,const SQChar *filen SQUIRREL_API SQRESULT sqstd_register_iolib(HSQUIRRELVM v); -#ifdef __cplusplus -} /*extern "C"*/ -#endif - #endif /*_SQSTDIO_H_*/ diff --git a/src/3rdparty/squirrel/include/sqstdmath.h b/src/3rdparty/squirrel/include/sqstdmath.h index 65de6fd72d..3d77d8a6eb 100644 --- a/src/3rdparty/squirrel/include/sqstdmath.h +++ b/src/3rdparty/squirrel/include/sqstdmath.h @@ -2,14 +2,6 @@ #ifndef _SQSTD_MATH_H_ #define _SQSTD_MATH_H_ -#ifdef __cplusplus -extern "C" { -#endif - SQUIRREL_API SQRESULT sqstd_register_mathlib(HSQUIRRELVM v); -#ifdef __cplusplus -} /*extern "C"*/ -#endif - #endif /*_SQSTD_MATH_H_*/ diff --git a/src/3rdparty/squirrel/include/sqstdstring.h b/src/3rdparty/squirrel/include/sqstdstring.h index 3c3bce826f..32b1a2c39a 100644 --- a/src/3rdparty/squirrel/include/sqstdstring.h +++ b/src/3rdparty/squirrel/include/sqstdstring.h @@ -2,10 +2,6 @@ #ifndef _SQSTD_STRING_H_ #define _SQSTD_STRING_H_ -#ifdef __cplusplus -extern "C" { -#endif - typedef unsigned int SQRexBool; typedef struct SQRex SQRex; @@ -26,8 +22,4 @@ SQUIRREL_API SQRESULT sqstd_format(HSQUIRRELVM v,SQInteger nformatstringidx,SQIn SQUIRREL_API SQRESULT sqstd_register_stringlib(HSQUIRRELVM v); -#ifdef __cplusplus -} /*extern "C"*/ -#endif - #endif /*_SQSTD_STRING_H_*/ diff --git a/src/3rdparty/squirrel/include/sqstdsystem.h b/src/3rdparty/squirrel/include/sqstdsystem.h index b155a91f8b..1e9b9b089a 100644 --- a/src/3rdparty/squirrel/include/sqstdsystem.h +++ b/src/3rdparty/squirrel/include/sqstdsystem.h @@ -2,14 +2,6 @@ #ifndef _SQSTD_SYSTEMLIB_H_ #define _SQSTD_SYSTEMLIB_H_ -#ifdef __cplusplus -extern "C" { -#endif - SQUIRREL_API SQInteger sqstd_register_systemlib(HSQUIRRELVM v); -#ifdef __cplusplus -} /*extern "C"*/ -#endif - #endif /* _SQSTD_SYSTEMLIB_H_ */ diff --git a/src/3rdparty/squirrel/include/squirrel.h b/src/3rdparty/squirrel/include/squirrel.h index 9a58adca61..84b3521dd7 100644 --- a/src/3rdparty/squirrel/include/squirrel.h +++ b/src/3rdparty/squirrel/include/squirrel.h @@ -31,10 +31,6 @@ to the following restrictions: #ifndef _SQUIRREL_H_ #define _SQUIRREL_H_ -#ifdef __cplusplus -extern "C" { -#endif - #if defined(_MSC_VER) # define inline __forceinline #endif /* _MSC_VER */ @@ -395,8 +391,4 @@ SQUIRREL_API void sq_setdebughook(HSQUIRRELVM v); #define SQ_FAILED(res) (res<0) #define SQ_SUCCEEDED(res) (res>=0) -#ifdef __cplusplus -} /*extern "C"*/ -#endif - #endif /*_SQUIRREL_H_*/