Separate sci_types enum type from stack-c.h into a dedicated file 03/903/3
Sylvestre Ledru [Tue, 8 Jun 2010 12:08:36 +0000 (14:08 +0200)]
Change-Id: I9355dab93265732da4c48332f13aaa6f24d637e9

scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/core.iss
scilab/modules/core/includes/sci_types.h [new file with mode: 0644]
scilab/modules/core/includes/stack-c.h

index 9a4c7e5..a88073f 100644 (file)
@@ -362,6 +362,7 @@ includes/scisparse.h \
 includes/sciquit.h \
 includes/setgetSCIpath.h \
 includes/stack-c.h \
+includes/sci_types.h \
 includes/stack-def.h \
 includes/stack.h \
 includes/stack1.h \
index 6a393a9..8bc6f20 100644 (file)
@@ -856,6 +856,7 @@ includes/scisparse.h \
 includes/sciquit.h \
 includes/setgetSCIpath.h \
 includes/stack-c.h \
+includes/sci_types.h \
 includes/stack-def.h \
 includes/stack.h \
 includes/stack1.h \
index 38fc1d3..ad6b637 100644 (file)
@@ -49,6 +49,7 @@ Source: modules\{#CORE}\includes\stack1.h; DestDir: {app}\modules\{#CORE}\includ
 Source: modules\{#CORE}\includes\stack2.h; DestDir: {app}\modules\{#CORE}\includes; Components: {#COMPN_SCILAB}
 Source: modules\{#CORE}\includes\stack3.h; DestDir: {app}\modules\{#CORE}\includes; Components: {#COMPN_SCILAB}
 Source: modules\{#CORE}\includes\stack-c.h; DestDir: {app}\modules\{#CORE}\includes; Components: {#COMPN_SCILAB}
+Source: modules\{#CORE}\includes\sci_types.h; DestDir: {app}\modules\{#CORE}\includes; Components: {#COMPN_SCILAB}
 Source: modules\{#CORE}\includes\stack-def.h; DestDir: {app}\modules\{#CORE}\includes; Components: {#COMPN_SCILAB}
 Source: modules\{#CORE}\includes\stack.h; DestDir: {app}\modules\{#CORE}\includes; Components: {#COMPN_SCILAB}
 Source: modules\{#CORE}\includes\stackinfo.h; DestDir: {app}\modules\{#CORE}\includes; Components: {#COMPN_SCILAB}
diff --git a/scilab/modules/core/includes/sci_types.h b/scilab/modules/core/includes/sci_types.h
new file mode 100644 (file)
index 0000000..2695ac7
--- /dev/null
@@ -0,0 +1,50 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ * Copyright (C) ENPC
+ * 
+ * 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 SCI_TYPES
+#define SCI_TYPES
+
+/*-------------------------------------------------
+ * types
+ * -------------------------------------------------*/
+
+typedef enum {
+  sci_matrix = 1 ,
+  sci_poly = 2 ,
+  sci_boolean = 4 ,
+  sci_sparse = 5  ,
+  sci_boolean_sparse = 6,
+  sci_matlab_sparse = 7, /* matlab sparse matrix  */
+  sci_ints = 8,
+  sci_handles =9,
+  sci_strings = 10,
+  sci_u_function = 11,
+  sci_c_function = 13 ,
+  sci_lib =  14,
+  sci_list = 15,
+  sci_tlist = 16,
+  sci_mlist = 17,
+  sci_pointer = 128, /* pointer */
+  sci_implicit_poly = 129,
+  sci_intrinsic_function = 130
+
+} sci_types;
+
+ /* lufact pointer... Done for backward compatibility. 
+  *    sci_lufact_pointer has been added to be able to handle umfpack datatype
+  * Since the use of pointer data structur is very interesting for Scilab 
+  * we decided to rename it to remove the reference of the initial use.
+  */
+#define sci_lufact_pointer sci_pointer
+
+#endif /* SCI_TYPES */
index a8c3cb5..9a94cf7 100644 (file)
@@ -39,39 +39,7 @@ extern "C" {
 #include "stack1.h"
 #include "stack2.h"
 #include "stack3.h"
-
-/*-------------------------------------------------
- * types
- * -------------------------------------------------*/
-
-typedef enum {
-  sci_matrix = 1 ,
-  sci_poly = 2 ,
-  sci_boolean = 4 ,
-  sci_sparse = 5  ,
-  sci_boolean_sparse = 6,
-  sci_matlab_sparse = 7, /* matlab sparse matrix  */
-  sci_ints = 8,
-  sci_handles =9,
-  sci_strings = 10,
-  sci_u_function = 11,
-  sci_c_function = 13 ,
-  sci_lib =  14,
-  sci_list = 15,
-  sci_tlist = 16,
-  sci_mlist = 17,
-  sci_pointer = 128, /* pointer */
-  sci_implicit_poly = 129,
-  sci_intrinsic_function = 130
-
-} sci_types;
-
- /* lufact pointer... Done for backward compatibility. 
-  *    sci_lufact_pointer has been added to be able to handle umfpack datatype
-  * Since the use of pointer data structur is very interesting for Scilab 
-  * we decided to rename it to remove the reference of the initial use.
-  */
-#define sci_lufact_pointer sci_pointer
+#include "sci_types.h"
 
 /*-------------------------------------------------
  * structure used for int matrix