summaryrefslogtreecommitdiff
path: root/src/matrixOperations/includes/cat.h
diff options
context:
space:
mode:
authorcornet2009-04-22 05:54:43 +0000
committercornet2009-04-22 05:54:43 +0000
commit879e2ac0a540fa1b199e20d47830aa5eea484a4c (patch)
tree69ef4242aa8ce27332dec2a27f4e7f10a6f9e8fb /src/matrixOperations/includes/cat.h
parent1811fe5588d0cfbb788ab8f477800af3f45dd710 (diff)
downloadscilab2c-879e2ac0a540fa1b199e20d47830aa5eea484a4c.tar.gz
scilab2c-879e2ac0a540fa1b199e20d47830aa5eea484a4c.tar.bz2
scilab2c-879e2ac0a540fa1b199e20d47830aa5eea484a4c.zip
build with visual studio (dynamic libraries)
Diffstat (limited to 'src/matrixOperations/includes/cat.h')
-rw-r--r--src/matrixOperations/includes/cat.h42
1 files changed, 26 insertions, 16 deletions
diff --git a/src/matrixOperations/includes/cat.h b/src/matrixOperations/includes/cat.h
index a28f004c..9f64a157 100644
--- a/src/matrixOperations/includes/cat.h
+++ b/src/matrixOperations/includes/cat.h
@@ -13,32 +13,38 @@
#ifndef __CAT_H__
#define __CAT_H__
+#include "dynlib_matrixoperations.h"
#include "floatComplex.h"
#include "doubleComplex.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
** \brief concat 2 floats scalars
*/
-void srowcats(float in1, float in2, float *out);
-void scolumncats(float in1, float in2, float *out);
+EXTERN_MATOPS void srowcats(float in1, float in2, float *out);
+EXTERN_MATOPS void scolumncats(float in1, float in2, float *out);
/*
** \brief concat 2 double scalars
*/
-void drowcats(double in1, double in2, double *out);
-void dcolumncats(double in1, double in2, double *out);
+EXTERN_MATOPS void drowcats(double in1, double in2, double *out);
+EXTERN_MATOPS void dcolumncats(double in1, double in2, double *out);
/*
** \brief concat 2 floats complex scalars
*/
-void crowcats(floatComplex in1, floatComplex in2, floatComplex *out);
-void ccolumncats(floatComplex in1, floatComplex in2, floatComplex *out);
+EXTERN_MATOPS void crowcats(floatComplex in1, floatComplex in2, floatComplex *out);
+EXTERN_MATOPS void ccolumncats(floatComplex in1, floatComplex in2, floatComplex *out);
/*
** \brief concat 2 double complex scalars
*/
-void zrowcats(doubleComplex in1, doubleComplex in2, doubleComplex *out);
-void zcolumncats(doubleComplex in1, doubleComplex in2, doubleComplex *out);
+EXTERN_MATOPS void zrowcats(doubleComplex in1, doubleComplex in2, doubleComplex *out);
+EXTERN_MATOPS void zcolumncats(doubleComplex in1, doubleComplex in2, doubleComplex *out);
/*
** \brief Concat float arrays
@@ -50,8 +56,8 @@ void zcolumncats(doubleComplex in1, doubleComplex in2, doubleComplex *out);
** \param columns2
** \param out the concatenation
*/
-void srowcata(float *in1, int lines1, int columns1, float *in2, int lines2, int columns2, float* out);
-void scolumncata(float *in1, int lines1, int columns1, float *in2, int lines2, int columns2, float* out);
+EXTERN_MATOPS void srowcata(float *in1, int lines1, int columns1, float *in2, int lines2, int columns2, float* out);
+EXTERN_MATOPS void scolumncata(float *in1, int lines1, int columns1, float *in2, int lines2, int columns2, float* out);
/*
** \brief Concat double arrays
@@ -63,8 +69,8 @@ void scolumncata(float *in1, int lines1, int columns1, float *in2, int lines2,
** \param columns2
** \param out the concatenation
*/
-void drowcata(double *in1, int lines1, int columns1, double *in2, int lines2, int columns2, double* out);
-void dcolumncata(double *in1, int lines1, int columns1, double *in2, int lines2, int columns2, double* out);
+EXTERN_MATOPS void drowcata(double *in1, int lines1, int columns1, double *in2, int lines2, int columns2, double* out);
+EXTERN_MATOPS void dcolumncata(double *in1, int lines1, int columns1, double *in2, int lines2, int columns2, double* out);
/*
** \brief Concat Complex float arrays
@@ -76,8 +82,8 @@ void dcolumncata(double *in1, int lines1, int columns1, double *in2, int lines2
** \param columns2
** \param out the concatenation
*/
-void crowcata(floatComplex *in1, int lines1, int columns1, floatComplex *in2, int lines2, int columns2, floatComplex* out);
-void ccolumncata(floatComplex *in1, int lines1, int columns1, floatComplex *in2, int lines2, int columns2, floatComplex* out);
+EXTERN_MATOPS void crowcata(floatComplex *in1, int lines1, int columns1, floatComplex *in2, int lines2, int columns2, floatComplex* out);
+EXTERN_MATOPS void ccolumncata(floatComplex *in1, int lines1, int columns1, floatComplex *in2, int lines2, int columns2, floatComplex* out);
/*
** \brief Concat Complex double arrays
@@ -89,7 +95,11 @@ void ccolumncata(floatComplex *in1, int lines1, int columns1, floatComplex *in2
** \param columns2
** \param out the concatenation
*/
-void zrowcata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, int lines2, int columns2, doubleComplex* out);
-void zcolumncata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, int lines2, int columns2, doubleComplex* out);
+EXTERN_MATOPS void zrowcata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, int lines2, int columns2, doubleComplex* out);
+EXTERN_MATOPS void zcolumncata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, int lines2, int columns2, doubleComplex* out);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
#endif /* !__CAT_H__ */