diff options
Diffstat (limited to 'src/string/includes')
-rw-r--r-- | src/string/includes/disp.h | 25 | ||||
-rw-r--r-- | src/string/includes/dynlib_string.h | 26 | ||||
-rw-r--r-- | src/string/includes/string.h | 24 |
3 files changed, 58 insertions, 17 deletions
diff --git a/src/string/includes/disp.h b/src/string/includes/disp.h index 63cde2ad..bf224b7e 100644 --- a/src/string/includes/disp.h +++ b/src/string/includes/disp.h @@ -16,59 +16,66 @@ #define __DISP_H__ #include <stdio.h> +#include "dynlib_string.h" #include "floatComplex.h" #include "doubleComplex.h" +#ifdef __cplusplus +extern "C" { +#endif /* ** \brief display of a float scalar */ -double sdisps (float in); +EXTERN_STRING double sdisps (float in); /* ** \brief display of a double scalar */ -double ddisps (double in); +EXTERN_STRING double ddisps (double in); /* ** \brief display of a float complex */ -double cdisps (floatComplex in); +EXTERN_STRING double cdisps (floatComplex in); /* ** \brief display of a double complex */ -double zdisps (doubleComplex in); +EXTERN_STRING double zdisps (doubleComplex in); /* ** \brief display of a float scalar array ** \param in the float scalar array to display ** \param size the size of the array */ -double sdispa (float* in, int rows, int columns); +EXTERN_STRING double sdispa (float* in, int rows, int columns); /* ** \brief display of a double scalar array ** \param in the double scalar array to display ** \param size the size of the array */ -double ddispa (double* in, int rows, int columns); +EXTERN_STRING double ddispa (double* in, int rows, int columns); /* ** \brief display of a float complex array ** \param in the float complex array to display ** \param size the size of the array */ -double cdispa (floatComplex* in, int rows, int columns); +EXTERN_STRING double cdispa (floatComplex* in, int rows, int columns); /* ** \brief display of a double complex array ** \param in the double complex array to display ** \param size the size of the array */ -double zdispa (doubleComplex* in, int rows, int columns); +EXTERN_STRING double zdispa (doubleComplex* in, int rows, int columns); -double g2dispd0(char *array,int* tmparraysize); +EXTERN_STRING double g2dispd0(char *array,int* tmparraysize); +#ifdef __cplusplus +} /* extern "C" */ +#endif #endif /* !__DISP_H__ */ diff --git a/src/string/includes/dynlib_string.h b/src/string/includes/dynlib_string.h new file mode 100644 index 00000000..e061d7e7 --- /dev/null +++ b/src/string/includes/dynlib_string.h @@ -0,0 +1,26 @@ +/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2009 - DIGITEO - Allan CORNET
+*
+* This file must be used under the terms of the CeCILL.
+* This source file is licensed as described in the file COPYING, which
+* you should have received as part of this distribution. The terms
+* are also available at
+* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+*
+*/
+
+#ifndef __DYNLIB_STRING_H__
+#define __DYNLIB_STRING_H__
+
+#ifdef _MSC_VER
+ #if STRING_EXPORTS
+ #define EXTERN_STRING __declspec (dllexport)
+ #else
+ #define EXTERN_STRING __declspec (dllimport)
+ #endif
+#else
+ #define EXTERN_MATOPS
+#endif
+
+#endif /* __DYNLIB_STRING_H__ */
diff --git a/src/string/includes/string.h b/src/string/includes/string.h index 37ac2d09..9cd6b523 100644 --- a/src/string/includes/string.h +++ b/src/string/includes/string.h @@ -16,37 +16,41 @@ #define __STRING_H__ #include <stdio.h> +#include "dynlib_string.h" #include "floatComplex.h" #include "doubleComplex.h" +#ifdef __cplusplus +extern "C" { +#endif /* ** \brief convert of a float scalar into a char array ** \param in the float scalar to convert ** \param out the output char array */ -void sstrings (float in, char* out); +EXTERN_STRING void sstrings (float in, char* out); /* ** \brief convert of a double scalar into a char array ** \param in the double scalar to convert ** \param out the output char array */ -void dstrings (double in, char* out); +EXTERN_STRING void dstrings (double in, char* out); /* ** \brief convert of a float complex into a char array ** \param in the float complex to convert ** \param out the output char array */ -void cstrings (floatComplex in, char* out); +EXTERN_STRING void cstrings (floatComplex in, char* out); /* ** \brief convert of a double complex into a char array ** \param in the double complex to convert ** \param out the output char array */ -void zstrings (doubleComplex in, char* out); +EXTERN_STRING void zstrings (doubleComplex in, char* out); /* @@ -54,27 +58,31 @@ void zstrings (doubleComplex in, char* out); ** \param in the float scalar array to convert ** \param out the output array of char arrays */ -void sstringa (float* in, int size, char** out); +EXTERN_STRING void sstringa (float* in, int size, char** out); /* ** \brief convert of a double scalar array into an array of char arrays ** \param in the double scalar array to convert ** \param out the output array of char arrays */ -void dstringa (double* in, int size, char** out); +EXTERN_STRING void dstringa (double* in, int size, char** out); /* ** \brief convert of a float complex array into an array of char arrays ** \param in the float complex array to convert ** \param out the output array of char arrays */ -void cstringa (floatComplex* in, int size, char** out ); +EXTERN_STRING void cstringa (floatComplex* in, int size, char** out ); /* ** \brief convert of a double complex array into an array of char arrays ** \param in the double complex array to convert ** \param out the output array of char arrays */ -void zstringa (doubleComplex* in, int size, char** out); +EXTERN_STRING void zstringa (doubleComplex* in, int size, char** out); + +#ifdef __cplusplus +} /* extern "C" */ +#endif #endif /* !__STRING_H__ */ |