From bb3415cb4c3aa6ca2f5277b245b5a8c13480f08b Mon Sep 17 00:00:00 2001 From: Frode Solheim Date: Sat, 5 Sep 2015 10:47:21 +0200 Subject: [PATCH] win32.cpp: include sys/mman.h -> uae/mman.h, remove unused sys/*.h --- od-win32/sys/ipc.h | 1 - od-win32/sys/mman.h | 51 --------------------------------------------- od-win32/sys/shm.h | 1 - od-win32/win32.cpp | 2 +- 4 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 od-win32/sys/ipc.h delete mode 100644 od-win32/sys/mman.h delete mode 100644 od-win32/sys/shm.h diff --git a/od-win32/sys/ipc.h b/od-win32/sys/ipc.h deleted file mode 100644 index 8b137891..00000000 --- a/od-win32/sys/ipc.h +++ /dev/null @@ -1 +0,0 @@ - diff --git a/od-win32/sys/mman.h b/od-win32/sys/mman.h deleted file mode 100644 index 1c1373be..00000000 --- a/od-win32/sys/mman.h +++ /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 -#include // for size_t -#include -#include - -#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 index 8b137891..00000000 --- a/od-win32/sys/shm.h +++ /dev/null @@ -1 +0,0 @@ - diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp index 48ded305..1cb6eeab 100644 --- a/od-win32/win32.cpp +++ b/od-win32/win32.cpp @@ -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" -- 2.47.3