diff options
| author | Brijeshcr | 2017-07-08 20:18:17 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-08 20:18:17 +0530 |
| commit | bd03b38be0918837e147e969c6bb2014900009db (patch) | |
| tree | 2cd9b7b1c15092e1367ed15e81aa71ccc9e05190 /src/c/elementaryFunctions | |
| parent | 97d1c6847a05bdb93557553a6bdcfd0f15feda99 (diff) | |
| download | Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.tar.gz Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.tar.bz2 Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.zip | |
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to 'src/c/elementaryFunctions')
| -rw-r--r-- | src/c/elementaryFunctions/includes/linspace.h | 5 | ||||
| -rw-r--r-- | src/c/elementaryFunctions/interfaces/int_linspace.h | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/c/elementaryFunctions/includes/linspace.h b/src/c/elementaryFunctions/includes/linspace.h index 00b1471..62d4501 100644 --- a/src/c/elementaryFunctions/includes/linspace.h +++ b/src/c/elementaryFunctions/includes/linspace.h @@ -21,16 +21,11 @@ extern "C" { EXTERN_ELEMFUNCT void dlinspaces(double low_limit,double up_limit,double range_num, double* out); -<<<<<<< HEAD EXTERN_ELEMFUNCT void slinspaces(float low_limit,float up_limit,float range_num, float* out); EXTERN_ELEMFUNCT void dlinspacea(double *low_limit,int row,double *up_limit,double range_num, double* out); EXTERN_ELEMFUNCT void slinspacea(float *low_limit,int row,float *up_limit,float range_num, float* out); -======= -EXTERN_ELEMFUNCT void dlinspacea(double *low_limit,int row,double *up_limit,double range_num, double* out); - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 diff --git a/src/c/elementaryFunctions/interfaces/int_linspace.h b/src/c/elementaryFunctions/interfaces/int_linspace.h index febe516..15ea269 100644 --- a/src/c/elementaryFunctions/interfaces/int_linspace.h +++ b/src/c/elementaryFunctions/interfaces/int_linspace.h @@ -15,15 +15,10 @@ #define d0d0d0linspaced2(in1,in2,in3,out) dlinspaces(in1,in2,in3,out) -<<<<<<< HEAD #define s0s0s0linspaces2(in1,in2,in3,out) slinspaces(in1,in2,in3,out) #define d2d2d0linspaced2(in1,size1,in2,size2,in3,out) dlinspacea(in1,size1[0],in2,in3,out) #define s2s2s0linspaces2(in1,size1,in2,size2,in3,out) slinspacea(in1,size1[0],in2,in3,out) -======= -#define d2d2d0linspaced2(in1,size1,in2,size2,in3,out) dlinspacea(in1,size1[0],in2,in3,out) - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #endif |