From 6772c883f560eeb1a05788faf5cb77277fde348a Mon Sep 17 00:00:00 2001
From: Martin Johansson <martin@fatbob.nu>
Date: Sun, 7 Dec 2014 21:37:16 +0100
Subject: [PATCH] Some cleanup. Removed sharedmemory_global.h

---
 shm_utils/mon-umurmurd/mon-umurmurd.c | 9 ++++++---
 src/sharedmemory.c                    | 7 +++++--
 src/sharedmemory_global.h             | 3 ---
 src/sharedmemory_struct.h             | 4 ++++
 4 files changed, 15 insertions(+), 8 deletions(-)
 delete mode 100644 src/sharedmemory_global.h

diff --git a/shm_utils/mon-umurmurd/mon-umurmurd.c b/shm_utils/mon-umurmurd/mon-umurmurd.c
index 7cd5697..393be37 100644
--- a/shm_utils/mon-umurmurd/mon-umurmurd.c
+++ b/shm_utils/mon-umurmurd/mon-umurmurd.c
@@ -7,11 +7,14 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <sys/types.h>
-#include "../../src/sharedmemory.h"
-#include "../../src/sharedmemory_global.h"
+#include "../../src/sharedmemory_struct.h"
 
 enum{ NOP_SHM, WAIT_ATTACH_SHM, TRY_ATTACH_SHM, MAT_SHM, CLEAN_UP_SHM, RUN_SHM };
 
+int shm_fd;
+shm_t *shmptr = NULL;
+char shm_file_name[128];
+
 int wait = 0, opt;
 uint8_t last, shm_statem = TRY_ATTACH_SHM;
 
@@ -161,4 +164,4 @@ int cc;
         {
             exit(EXIT_FAILURE); //You dont have to exit you could just report the fact that the data is not valid 
         }
-}
\ No newline at end of file
+}
diff --git a/src/sharedmemory.c b/src/sharedmemory.c
index 9018f5c..c2b703a 100644
--- a/src/sharedmemory.c
+++ b/src/sharedmemory.c
@@ -1,5 +1,8 @@
 #include "sharedmemory.h"
-#include "sharedmemory_global.h"
+
+int shm_fd;
+shm_t *shmptr = NULL;
+char shm_file_name[128];
 
 void Sharedmemory_init( int bindport, int bindport6 ) 
 {
@@ -114,4 +117,4 @@ void Sharedmemory_deinit(void)
   close( shm_fd );
   shm_unlink( shm_file_name );
   shmptr->umurmurd_pid = 0;
-}
\ No newline at end of file
+}
diff --git a/src/sharedmemory_global.h b/src/sharedmemory_global.h
deleted file mode 100644
index b68fcde..0000000
--- a/src/sharedmemory_global.h
+++ /dev/null
@@ -1,3 +0,0 @@
-int shm_fd;
-shm_t *shmptr = NULL;
-char shm_file_name[128];
diff --git a/src/sharedmemory_struct.h b/src/sharedmemory_struct.h
index a36382e..de356c4 100644
--- a/src/sharedmemory_struct.h
+++ b/src/sharedmemory_struct.h
@@ -1,3 +1,7 @@
+#include <arpa/inet.h>
+#include <stdint.h>
+#include "types.h"
+
 typedef struct
 {
 
-- 
2.30.2