needless compat api breakage

2 files changed, 5 insertions, 8 deletions

diff --git a/compat/compat.cpp b/compat/compat.cpp
index 7b695617..b5d63f2b 100644
--- a/compat/compat.cpp
+++ b/compat/compat.cpp
@@ -4,12 +4,12 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  */
+
+#include <cstring>
 #define IN_FTNOIR_COMPAT
 #include "compat.h"
-#include <string.h>
 
 #if defined(_WIN32)
-
 PortableLockedShm::PortableLockedShm(const char* shmName, const char* mutexName, int mapSize)
 {
     hMutex = CreateMutexA(NULL, false, mutexName);
@@ -43,8 +43,8 @@ void PortableLockedShm::unlock()
 {
     (void) ReleaseMutex(hMutex);
 }
-
 #else
+#pragma GCC diagnostic ignored "-Wunused-result"
 PortableLockedShm::PortableLockedShm(const char *shmName, const char* /*mutexName*/, int mapSize) : size(mapSize)
 {
     char filename[512] = {0};
@@ -57,8 +57,6 @@ PortableLockedShm::PortableLockedShm(const char *shmName, const char* /*mutexNam
 
 PortableLockedShm::~PortableLockedShm()
 {
-    //(void) shm_unlink(shm_filename);
-
     (void) munmap(mem, size);
     (void) close(fd);
 }
@@ -72,7 +70,6 @@ void PortableLockedShm::unlock()
 {
     flock(fd, LOCK_UN);
 }
-
 #endif
 
 bool PortableLockedShm::success()
diff --git a/compat/compat.h b/compat/compat.h
index 0e488752..490d8913 100644
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -38,12 +38,12 @@ public:
     void lock();
     void unlock();
     bool success();
-    void* mem;
+    inline void* ptr() { return mem; }
 private:
+    void* mem;
 #if defined(_WIN32)
     HANDLE hMutex, hMapFile;
 #else
     int fd, size;
-    //char shm_filename[NAME_MAX];
 #endif
 };