From ee26b8ff850add4f83b912635a71dbde06f268d1 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Fri, 3 Feb 2017 22:20:35 +0100
Subject: Continuing Implementation...

---
 src/server/CMakeLists.txt | 2 +-
 src/server/server_types.h | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/server')

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index b3f0c15..ca476fb 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -6,7 +6,7 @@ set(
    ${CMAKE_CURRENT_SOURCE_DIR}/server_initialize.c
    ${CMAKE_CURRENT_SOURCE_DIR}/server_joining_threads.c
    ${CMAKE_CURRENT_SOURCE_DIR}/server_new_connection.c
-   ${CMAKE_CURRENT_SOURCE_DIR}/server_signals.c
+   ${CMAKE_CURRENT_SOURCE_DIR}/server_signal.c
    ${CMAKE_CURRENT_SOURCE_DIR}/server_wait_for_event.c
    ${CMAKE_CURRENT_SOURCE_DIR}/server_worker.c
    ${CMAKE_CURRENT_SOURCE_DIR}/server_worker_handle_request.c
diff --git a/src/server/server_types.h b/src/server/server_types.h
index 99959f5..fb78b77 100644
--- a/src/server/server_types.h
+++ b/src/server/server_types.h
@@ -3,7 +3,9 @@
 
 #include <sys/time.h>
 
-#include <pthread.h>
+#ifndef ZoO_RUNNING_FRAMA_C
+   #include <pthread.h>
+#endif
 
 #include "../core/index.h"
 
@@ -24,7 +26,9 @@ enum ZoO_server_thread_state
 
 struct ZoO_server_thread_data
 {
+#ifndef ZoO_RUNNING_FRAMA_C
    pthread_t posix_id;
+#endif
    enum ZoO_server_thread_state state;
 };
 
@@ -32,8 +36,10 @@ struct ZoO_server_thread_collection
 {
    struct ZoO_server_thread_data * threads;
    size_t threads_capacity;
+#ifndef ZoO_RUNNING_FRAMA_C
    pthread_mutex_t mutex;
    pthread_barrier_t barrier;
+#endif
    ZoO_index currently_running;
 };
 
-- 
cgit v1.2.3-70-g09d2