1.Sci2cDeps updated 2.Windows compatibility resolved

1 files changed, 43 insertions, 0 deletions

diff --git a/2.3-1/includes/sci2clib.h b/2.3-1/includes/sci2clib.h
index fcaac7d7..80af0fe3 100644
--- a/2.3-1/includes/sci2clib.h
+++ b/2.3-1/includes/sci2clib.h
@@ -18,6 +18,7 @@ extern "C" {
 /* interfacing lapack */
 #include "lapack.h"
 
+<<<<<<< HEAD
 
 #include "sva.h"
 #include "int_sva.h"
@@ -27,6 +28,8 @@ extern "C" {
 #include "int_svd.h"
 
 
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 /* AUXILIARY FUNCTIONS */
 
 /* interfacing abs */
@@ -74,6 +77,7 @@ extern "C" {
 #include "rand.h"
 #include "int_rand.h"
 
+<<<<<<< HEAD
 /* INTERPOLATION FUNCTIONS*/
 
 /*interfacing interp1*/
@@ -90,6 +94,10 @@ extern "C" {
 /* interfacing isreal*/
 #include "isreal.h"
 #include "int_isreal.h"
+=======
+/* ELEMENTARY FUNCTIONS */
+
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 /* interfacing atand */
 #include "atand.h"
 #include "int_atand.h"
@@ -212,12 +220,15 @@ extern "C" {
 /* interfacing int16 */
 #include "int16.h"
 #include "int_int16.h"
+<<<<<<< HEAD
 /* interfacing uint32 */
 #include "uint32.h"
 #include "int_uint32.h"
 /* interfacing int32 */
 #include "int32.h"
 #include "int_int32.h"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 /*interfacing bitand */
 #include "bitand.h"
@@ -333,6 +344,7 @@ extern "C" {
 #include "factor.h"
 #include "int_factor.h"
 
+<<<<<<< HEAD
 /*interfacing gcd*/
 #include "gcd.h"
 #include "int_gcd.h"
@@ -342,6 +354,8 @@ extern "C" {
 #include "int_lcm.h"
 
 
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 /* IMPLICIT LISTS */
 /* interfacing implicitList/OpColon */
 #include "implicitList.h"
@@ -411,7 +425,11 @@ extern "C" {
 /* interfacing ones */
 #include "ones.h"
 #include "int_ones.h"
+<<<<<<< HEAD
 /* Linear Algebra - spec */
+=======
+/* interfacing spec */
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 #include "spec.h"
 #include "int_spec.h"
 /* interfacing trace */
@@ -455,6 +473,7 @@ extern "C" {
 
 
 /* SIGNAL PROCESSING */
+<<<<<<< HEAD
 
 
 #include "modk.h"
@@ -467,6 +486,8 @@ extern "C" {
 //#include "dct.h"
 //#include "int_dct.h"
 
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 /* interfacing convol */
 #include "conv.h"
 #include "conv2d.h"
@@ -486,6 +507,7 @@ extern "C" {
 #include "lev.h"
 #include "int_lev.h"
 
+<<<<<<< HEAD
 /* interfacing zpbutt */
 #include "zpbutt.h"
 #include "int_zpbutt.h"
@@ -545,6 +567,9 @@ extern "C" {
 /* interfacing amell */
 #include "amell.h"
 #include "int_amell.h"
+=======
+
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 /* STATISTICS FUNCTIONS */
 
@@ -613,6 +638,7 @@ extern "C" {
 #include "strrchr.h"
 #include "int_strrchr.h"
 
+<<<<<<< HEAD
 /*interfacing strchr*/
 #include "strchr.h"
 #include "int_strchr.h"
@@ -633,6 +659,8 @@ extern "C" {
 #include "strncpy.h"
 #include "int_strncpy.h"
 
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 /*Functions related to strings*/
 #include "convstr.h"
 #include "int_convstr.h"
@@ -656,6 +684,7 @@ extern "C" {
 #include "balanc.h"
 #include "int_balanc.h"	
 
+<<<<<<< HEAD
 #include "svd.h"		/*Linear Alegbra - Singular value decompostion */
 #include "int_svd.h"
 
@@ -784,6 +813,20 @@ extern "C" {
 #include "int_RPIPeripheralSoft.h"
 #include "RPIPeripheralTiming.h"
 #include "int_RPIPeripheralTiming.h"
+=======
+#include "int_RPIPeripheralDigital.h"
+#include "RPIPeripheralDigital.h"
+#include "int_RPIPeripheralTiming.h"
+#include "RPIPeripheralTiming.h"
+#include "int_RPIPeripheralSerial.h"
+#include "RPIPeripheralSerial.h"
+#include "int_RPIPeripheralThreading.h"
+#include "RPIPeripheralThreading.h"
+#include "int_RPIPeripheralPinISR.h"
+#include "RPIPeripheralPinISR.h"
+#include "int_RPIPeripheralPWM.h"
+#include "RPIPeripheralPWM.h"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 #endif
 
 #ifdef __cplusplus