From e63afea06975758ad0a057b797f3946439d4ddd7 Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Sun, 7 Jun 2015 12:01:48 -0700
Subject: [PATCH] Refactor : excise LPBYTE, LPLONG

---
 src/audio/ds-shim.h          | 2 +-
 src/audio/mockingboard.c     | 2 +-
 src/audio/mockingboard.h     | 2 +-
 src/audio/soundcore-openal.c | 2 +-
 src/audio/win-shim.h         | 2 --
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/audio/ds-shim.h b/src/audio/ds-shim.h
index dded31f2..c1929aad 100644
--- a/src/audio/ds-shim.h
+++ b/src/audio/ds-shim.h
@@ -22,7 +22,7 @@ typedef struct IDirectSoundBuffer {
 
     int (*SetVolume)(void* _this, long lVolume);
 
-    int (*GetVolume)(void* _this, LPLONG lplVolume);
+    int (*GetVolume)(void* _this, long *lplVolume);
 
     int (*GetCurrentPosition)(void* _this, LPDWORD lpdwCurrentPlayCursor, LPDWORD lpdwCurrentWriteCursor);
 
diff --git a/src/audio/mockingboard.c b/src/audio/mockingboard.c
index a2e53962..8a610117 100644
--- a/src/audio/mockingboard.c
+++ b/src/audio/mockingboard.c
@@ -1918,7 +1918,7 @@ static void RegisterIoHandler(UINT uSlot, iofunction IOReadC0, iofunction IOWrit
 }
 #endif
 
-void MB_InitializeIO(LPBYTE unused_pCxRomPeripheral, UINT uSlot4, UINT uSlot5)
+void MB_InitializeIO(char *unused_pCxRomPeripheral, UINT uSlot4, UINT uSlot5)
 {
 	// Mockingboard: Slot 4 & 5
 	// Phasor      : Slot 4
diff --git a/src/audio/mockingboard.h b/src/audio/mockingboard.h
index 0cb02528..588fcebb 100644
--- a/src/audio/mockingboard.h
+++ b/src/audio/mockingboard.h
@@ -100,7 +100,7 @@ void	MB_Initialize();
 void	MB_Reinitialize();
 void	MB_Destroy();
 void    MB_Reset();
-void    MB_InitializeIO(LPBYTE pCxRomPeripheral, UINT uSlot4, UINT uSlot5);
+void    MB_InitializeIO(char *pCxRomPeripheral, UINT uSlot4, UINT uSlot5);
 void    MB_Mute();
 void    MB_Demute();
 void    MB_StartOfCpuExecute();
diff --git a/src/audio/soundcore-openal.c b/src/audio/soundcore-openal.c
index 1e052c33..ae24f74d 100644
--- a/src/audio/soundcore-openal.c
+++ b/src/audio/soundcore-openal.c
@@ -725,7 +725,7 @@ static long OpenALCreateSoundBuffer(ALBufferParamsStruct *params, ALSoundBufferS
 
         (*soundbuf_struct)->_this = voice;
         (*soundbuf_struct)->SetVolume          = (int (*)(void *, long))ALSetVolume;
-        (*soundbuf_struct)->GetVolume          = (int (*)(void *, LPLONG))ALGetVolume;
+        (*soundbuf_struct)->GetVolume          = (int (*)(void *, long *))ALGetVolume;
         (*soundbuf_struct)->GetCurrentPosition = (int (*)(void *, LPDWORD, LPDWORD))ALGetPosition;
         (*soundbuf_struct)->Stop               = (int (*)(void *))ALStop;
         (*soundbuf_struct)->Restore            = (int (*)(void *))ALRestore;
diff --git a/src/audio/win-shim.h b/src/audio/win-shim.h
index a4832387..62868a30 100644
--- a/src/audio/win-shim.h
+++ b/src/audio/win-shim.h
@@ -27,10 +27,8 @@
 
 typedef unsigned int UINT;
 
-typedef long *LPLONG;
 typedef void *LPVOID;
 typedef void *LPDVOID;
-typedef char *LPBYTE;
 typedef unsigned long *LPDWORD;
 
 #if !defined(TRUE)