Modify mds-server to use mds-base (some regression...)

Signed-off-by: Mattias Andrée <maandree@operamail.com>

1 files changed, 2 insertions, 27 deletions

diff --git a/src/mds-server/globals.h b/src/mds-server/globals.h
index 1016ae7..e9465f0 100644
--- a/src/mds-server/globals.h
+++ b/src/mds-server/globals.h
@@ -18,6 +18,8 @@
 #ifndef MDS_MDS_SERVER_GLOBALS_H
 #define MDS_MDS_SERVER_GLOBALS_H
 
+#include "../mds-base.h" /* Include here so other do not need to. */
+
 
 #include <libmdsserver/linked-list.h>
 #include <libmdsserver/hash-table.h>
@@ -34,32 +36,10 @@
 
 
 /**
- * Number of elements in `argv`
- */
-extern int argc;
-
-/**
- * Command line arguments
- */
-extern char** argv;
-
-
-/**
  * The program run state, 1 when running, 0 when shutting down
  */
 extern volatile sig_atomic_t running;
 
-/**
- * Non-zero when the program is about to re-exec.
- * Most at all times be at least as true as `terminating`.
- */
-extern volatile sig_atomic_t reexecing;
-
-/**
- * Non-zero when the program is about to terminate
- */
-extern volatile sig_atomic_t terminating;
-
 
 /**
  * The number of running slaves
@@ -77,11 +57,6 @@ extern pthread_mutex_t slave_mutex;
 extern pthread_cond_t slave_cond;
 
 /**
- * The thread that runs the master loop
- */
-extern pthread_t master_thread;
-
-/**
  * Map from client socket file descriptor to all information (client_t)
  */
 extern fd_table_t client_map;