star-enclosures-3d

commit c236a82cdd2c26661b00aa6f2dcd12a6c08e26f2
parent c1e72f8b2c6bc560d3c2564cfc10ac44092c12e1
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Tue,  6 Mar 2018 18:41:52 +0100

More Linux build.

Diffstat:
M
cmake/CMakeLists.txt
 | 
1
-
M
src/senc_internal_types.h
 | 
2
+-
M
src/senc_s3d_wrapper.h
 | 
4
++--
M
src/senc_scene_analyze.c
 | 
4
++--

4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -86,7 +86,6 @@ set_target_properties(senc PROPERTIES
   SOVERSION ${VERSION_MAJOR})
 rcmake_copy_runtime_libraries(senc)
 
-set_property(TARGET senc PROPERTY C_STANDARD 99) # to make __FUNCTION__ available
 if(CMAKE_COMPILER_IS_GNUCC)
   set_target_properties(senc PROPERTIES LINK_FLAGS "${OpenMP_C_FLAGS}")
   target_link_libraries(senc m)
diff --git a/src/senc_internal_types.h b/src/senc_internal_types.h
@@ -24,7 +24,7 @@
 #define OK2(Expr, Label)\
   res = (Expr);\
   if(res != RES_OK) {\
-    fprintf(stderr, "%s: error code set to %d at line %d\n", __FUNCTION__, res, __LINE__);\
+    fprintf(stderr, "%s: error code set to %d at line %d\n", FUNC_NAME, res, __LINE__);\
     goto Label;\
   }
 
diff --git a/src/senc_s3d_wrapper.h b/src/senc_s3d_wrapper.h
@@ -34,7 +34,7 @@ senc_descriptor_get_global_indices__
   ASSERT(r == RES_OK); (void)r;
 }
 
-FINLINE void
+static FINLINE void
 senc_descriptor_get_global_vertices__
   (const unsigned ivert,
    float coord[3],
@@ -62,7 +62,7 @@ senc_enclosure_get_triangle__
   ASSERT(r == RES_OK); (void)r;
 }
 
-FINLINE void
+static FINLINE void
 senc_enclosure_get_vertex__
   (const unsigned ivert,
    float coord[3],
diff --git a/src/senc_scene_analyze.c b/src/senc_scene_analyze.c
@@ -926,7 +926,7 @@ build_result
 {
   res_T res = RES_OK;
   struct mem_allocator* alloc;
-  const struct cc_descriptor* const* cc_descriptors;
+  struct cc_descriptor* const* cc_descriptors;
   struct enclosure_data* enclosures;
   const struct triangle_in* triangles_in;
   struct triangle_enc* triangles_enc;
@@ -975,7 +975,7 @@ build_result
       struct enclosure_data* enc = enclosures + e;
       const struct cc_descriptor* current = cc_descriptors[enc->first_component];
       trg_id_t fst_idx = 0;
-      trg_id_t sgd_idx = enc->side_count;;
+      trg_id_t sgd_idx = enc->side_count;
       trg_id_t t;
       ASSERT(enc->first_component
         < darray_ptr_component_descriptor_size_get(connex_components));