From 5312ddee00893a379190ec4379c2a6d94b0bf02e Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Sun, 7 Jun 2015 11:49:32 -0700
Subject: [PATCH] Refactor : ULONG -> unsigned long

---
 src/audio/AY8910.h       |  2 +-
 src/audio/mockingboard.c | 10 +++++-----
 src/audio/win-shim.h     |  4 ----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/audio/AY8910.h b/src/audio/AY8910.h
index 270c2e8f..62a669f7 100644
--- a/src/audio/AY8910.h
+++ b/src/audio/AY8910.h
@@ -31,7 +31,7 @@ void AY8910UpdateSetCycles();
 //-------------------------------------
 // FUSE stuff
 
-typedef ULONG libspectrum_dword;
+typedef unsigned long libspectrum_dword;
 typedef uint8_t libspectrum_byte;
 typedef int16_t libspectrum_signed_word;
 
diff --git a/src/audio/mockingboard.c b/src/audio/mockingboard.c
index 214719a6..8e05aabe 100644
--- a/src/audio/mockingboard.c
+++ b/src/audio/mockingboard.c
@@ -156,7 +156,7 @@ typedef struct
 static SY6522_AY8910 g_MB[NUM_AY8910];
 
 // Timer vars
-static ULONG g_n6522TimerPeriod = 0;
+static unsigned long g_n6522TimerPeriod = 0;
 #ifdef APPLE2IX
 #define TIMERDEVICE_INVALID -1
 #else
@@ -1697,7 +1697,7 @@ void MB_Reset()
 #define nAddr ea
 GLUE_C_READ(MB_Read)
 #else
-static uint8_t MB_Read(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nValue, ULONG nCyclesLeft)
+static uint8_t MB_Read(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nValue, unsigned long nCyclesLeft)
 #endif
 {
 	MB_UpdateCycles();
@@ -1775,7 +1775,7 @@ static uint8_t MB_Read(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nVal
 #define nValue b
 GLUE_C_WRITE(MB_Write)
 #else
-static uint8_t MB_Write(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nValue, ULONG nCyclesLeft)
+static uint8_t MB_Write(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nValue, unsigned long nCyclesLeft)
 #endif
 {
 	MB_UpdateCycles();
@@ -1858,7 +1858,7 @@ static uint8_t MB_Write(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nVa
 #ifdef APPLE2IX
 GLUE_C_READ(PhasorIO)
 #else
-static uint8_t PhasorIO(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nValue, ULONG nCyclesLeft)
+static uint8_t PhasorIO(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nValue, unsigned long nCyclesLeft)
 #endif
 {
 	if(!g_bPhasorEnable)
@@ -1891,7 +1891,7 @@ void mb_io_initialize(unsigned int slot4, unsigned int slot5)
     MB_InitializeIO(NULL, slot4, slot5);
 }
 
-//typedef uint8_t (*iofunction)(uint16_t nPC, uint16_t nAddr, uint8_t nWriteFlag, uint8_t nWriteValue, ULONG nCyclesLeft);
+//typedef uint8_t (*iofunction)(uint16_t nPC, uint16_t nAddr, uint8_t nWriteFlag, uint8_t nWriteValue, unsigned long nCyclesLeft);
 typedef void (*iofunction)();
 static void RegisterIoHandler(UINT uSlot, iofunction IOReadC0, iofunction IOWriteC0, iofunction IOReadCx, iofunction IOWriteCx, LPVOID unused_lpSlotParameter, uint8_t* unused_pExpansionRom)
 {
diff --git a/src/audio/win-shim.h b/src/audio/win-shim.h
index e1f186b5..a7064915 100644
--- a/src/audio/win-shim.h
+++ b/src/audio/win-shim.h
@@ -25,10 +25,6 @@
 
 // 2013/09/19 - http://msdn.microsoft.com/en-us/library/windows/desktop/aa383751(v=vs.85).aspx
 
-#ifdef __APPLE__
-typedef UInt32 ULONG;
-#endif
-typedef unsigned long ULONG;
 typedef long LONG;
 typedef unsigned int UINT;
 typedef char TCHAR;