star-3d

commit bde58872497806c38f523f42cb2965db31981abe
parent 8c7972aa541c51885627d5ea8a3f9a8edbbbe655
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 31 Mar 2015 15:14:04 +0200

Minor fixes

Diffstat:
M
src/s3d_device.c
 | 
4
++--
M
src/test_s3d_utils.h
 | 
5
+++++

2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/s3d_device.c b/src/s3d_device.c
@@ -72,7 +72,7 @@ s3d_device_create
     res = RES_BAD_ARG;
     goto error;
   }
-  if(ATOMIC_GET(&g_EmbreeIsInitialized)) {
+  if(g_EmbreeIsInitialized) {
     res = RES_BAD_ARG;
     goto error;
   }
@@ -87,7 +87,7 @@ s3d_device_create
   dev->allocator = allocator;
   ref_init(&dev->ref);
   rtcInit("verbose=1");
-  ATOMIC_SET(&g_EmbreeIsInitialized, 1);
+  g_EmbreeIsInitialized =  1;
 
 exit:
   if(out_dev) *out_dev = dev;
diff --git a/src/test_s3d_utils.h b/src/test_s3d_utils.h
@@ -30,6 +30,9 @@
  * The fact that you are presently reading this means that you have had
  * knowledge of the CeCILL license and that you accept its terms. */
 
+#ifndef TEST_S3D_UTILS_H
+#define TEST_S3D_UTILS_H
+
 #include <rsys/mem_allocator.h>
 #include <stdio.h>
 
@@ -43,3 +46,5 @@ check_memory_allocator(struct mem_allocator* allocator)
     FATAL("Memory leaks\n");
   }
 }
+
+#endif /* TEST_S3D_UTILS_H */