jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scilab: simplify version check and fix for scilab 6

Browse source
This commit is contained in:
Simon Marchetto 2014-05-22 09:52:38 +02:00
commit 76ce1fcd8c
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/scilab/scirun.swg
View file

@ -4,19 +4,15 @@
/* Scilab version macro */ /* Scilab version macro */
#ifndef SWIG_SCILAB_VERSION_MIN #include "version.h"
#define SWIG_SCILAB_VERSION_MIN(major, minor, maintenance) \ #define SWIG_SCILAB_VERSION (SCI_VERSION_MAJOR * 100) + (SCI_VERSION_MINOR * 10) + SCI_VERSION_MAINTENANCE
((SCI_VERSION_MAJOR << 16) + (SCI_VERSION_MINOR << 8) + SCI_VERSION_MAINTENANCE \
>= ((major) << 16) + ((minor) << 8) + maintenance)
#endif
/* Scilab standard headers */ /* Scilab standard headers */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#if !SWIG_SCILAB_VERSION_MIN(5, 4, 0) #if SWIG_SCILAB_VERSION < 540
#define __USE_DEPRECATED_STACK_FUNCTIONS__ #define __USE_DEPRECATED_STACK_FUNCTIONS__
#include "stack-c.h" #include "stack-c.h"
#endif #endif
@ -34,7 +30,7 @@ extern "C" {
/* Gateway signature */ /* Gateway signature */
#if SWIG_SCILAB_VERSION_MIN(6, 0, 0) #if SWIG_SCILAB_VERSION >= 600
#define SWIG_GatewayParameters char* fname, void *pvApiCtx #define SWIG_GatewayParameters char* fname, void *pvApiCtx
#define SWIG_GatewayArguments fname, pvApiCtx #define SWIG_GatewayArguments fname, pvApiCtx
#else #else
@ -59,7 +55,7 @@ static void SWIG_Scilab_SetFname(char* _fname) {
/* Argument management functions */ /* Argument management functions */
#if SWIG_SCILAB_VERSION_MIN(5, 4, 0) #if SWIG_SCILAB_VERSION >= 540
#define SWIG_CheckInputArgument(pvApiCtx, minInputArgument, maxInputArgument) CheckInputArgument(pvApiCtx, minInputArgument, maxInputArgument) #define SWIG_CheckInputArgument(pvApiCtx, minInputArgument, maxInputArgument) CheckInputArgument(pvApiCtx, minInputArgument, maxInputArgument)
#define SWIG_CheckOutputArgument(pvApiCtx, minOutputArgument, maxOutputArgument) CheckOutputArgument(pvApiCtx, minOutputArgument, maxOutputArgument) #define SWIG_CheckOutputArgument(pvApiCtx, minOutputArgument, maxOutputArgument) CheckOutputArgument(pvApiCtx, minOutputArgument, maxOutputArgument)
#define SWIG_NbInputArgument(pvApiCtx) nbInputArgument(pvApiCtx) #define SWIG_NbInputArgument(pvApiCtx) nbInputArgument(pvApiCtx)