1 files changed, 10 insertions, 7 deletions
diff --git a/compat/shm.h b/compat/shm.h
index 5ea6c80a..5036b335 100644
--- a/compat/shm.h
+++ b/compat/shm.h
@@ -19,8 +19,8 @@
 #include <sys/types.h>
 #endif
 
-#include "macros.hpp"
 #include "export.hpp"
+#include "macros.h"
 
 class OTR_COMPAT_EXPORT shm_wrapper final
 {
@@ -28,14 +28,17 @@ class OTR_COMPAT_EXPORT shm_wrapper final
 #if defined(_WIN32)
     HANDLE mutex, mapped_file;
 #else
-    int fd, size;
+    int fd;
+    unsigned size;
 #endif
 
 public:
-    never_inline shm_wrapper(const char *shm_name, const char *mutex_name, int map_size);
-    never_inline ~shm_wrapper();
-    never_inline bool lock();
-    never_inline bool unlock();
-    never_inline bool success();
+    shm_wrapper(const char *shm_name, const char *mutex_name, int map_size);
+    ~shm_wrapper();
+    bool lock();
+    bool unlock();
+    bool success();
     inline void* ptr() { return mem; }
+
+    OTR_DISABLE_MOVE_COPY(shm_wrapper);
 };