]> git.unchartedbackwaters.co.uk Git - francis/winuae.git/commitdiff
win32.cpp: include sys/mman.h -> uae/mman.h, remove unused sys/*.h
authorFrode Solheim <frode@fs-uae.net>
Sat, 5 Sep 2015 08:47:21 +0000 (10:47 +0200)
committerFrode Solheim <frode@fs-uae.net>
Sat, 5 Sep 2015 08:49:29 +0000 (10:49 +0200)
od-win32/sys/ipc.h [deleted file]
od-win32/sys/mman.h [deleted file]
od-win32/sys/shm.h [deleted file]
od-win32/win32.cpp

diff --git a/od-win32/sys/ipc.h b/od-win32/sys/ipc.h
deleted file mode 100644 (file)
index 8b13789..0000000
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/od-win32/sys/mman.h b/od-win32/sys/mman.h
deleted file mode 100644 (file)
index 1c1373b..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-// Implement MMAN and SHM functionality for Win32
-// Copyright (C) 2000, Brian King
-// GNU Public License
-
-#ifndef _MMAN_H_
-#define _MMAN_H_
-
-#include <windows.h>
-#include <stdio.h> // for size_t
-#include <time.h>
-#include <signal.h>
-
-#define MAX_SHMID 256
-
-extern uae_u8 *natmem_offset;
-
-typedef int key_t;
-typedef USHORT ushort;
-
-/* One shmid data structure for each shared memory segment in the system. */
-struct shmid_ds {
-    key_t key;
-    size_t size;
-       size_t rosize;
-    void  *addr;
-    TCHAR name[MAX_PATH];
-    void *attached;
-    int mode;
-    void *natmembase;
-       bool fake;
-       int maprom;
-};
-
-int mprotect (void *addr, size_t len, int prot);
-void *shmat (addrbank *ab, int shmid, LPVOID shmaddr, int shmflg);
-int shmdt (const void *shmaddr);
-int shmget (key_t key, size_t size, int shmflg, const TCHAR*);
-int shmctl (int shmid, int cmd, struct shmid_ds *buf);
-bool init_shm (void);
-void free_shm (void);
-
-#define PROT_READ  0x01
-#define PROT_WRITE 0x02
-#define PROT_EXEC  0x04
-
-#define IPC_PRIVATE 0x01
-#define IPC_RMID    0x02
-#define IPC_CREAT   0x04
-#define IPC_STAT    0x08
-
-#endif
diff --git a/od-win32/sys/shm.h b/od-win32/sys/shm.h
deleted file mode 100644 (file)
index 8b13789..0000000
+++ /dev/null
@@ -1 +0,0 @@
-
index 48ded305f0605a911818ae2aec6d259e4740ec7b..1cb6eeabdc2d2393e72a91b314af8d079ef24870 100644 (file)
@@ -70,7 +70,7 @@
 #include "win32gui.h"
 #include "autoconf.h"
 #include "gui.h"
-#include "sys/mman.h"
+#include "uae/mman.h"
 #include "avioutput.h"
 #include "ahidsound.h"
 #include "ahidsound_new.h"