From 36b464cbc82ac8309a12aef537bd7c157b88cae0 Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Tue, 2 Sep 2008 23:32:05 +0000
Subject: [PATCH] Replaced "unsigned __int16" by "u16".

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@431 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Src/HW/PixelEngine.cpp    |  2 +-
 Source/Core/Core/Src/HW/PixelEngine.h      |  4 +--
 Source/PluginSpecs/CommonTypes.h           |  1 -
 Source/Plugins/Plugin_DSP_LLE/Src/main.cpp | 42 ++++------------------
 4 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/Source/Core/Core/Src/HW/PixelEngine.cpp b/Source/Core/Core/Src/HW/PixelEngine.cpp
index dc3569f667..290e3a6f71 100644
--- a/Source/Core/Core/Src/HW/PixelEngine.cpp
+++ b/Source/Core/Core/Src/HW/PixelEngine.cpp
@@ -181,7 +181,7 @@ void SetFinish_OnMainThread(u64 userdata, int cyclesLate)
 
 // SetToken
 // THIS IS EXECUTED FROM VIDEO THREAD
-void SetToken(const unsigned __int16 _token, const int _bSetTokenAcknowledge)
+void SetToken(const u16 _token, const int _bSetTokenAcknowledge)
 {
 	CoreTiming::ScheduleEvent_Threadsafe(
 		0, et_SetTokenOnMainThread, _token | (_bSetTokenAcknowledge << 16));
diff --git a/Source/Core/Core/Src/HW/PixelEngine.h b/Source/Core/Core/Src/HW/PixelEngine.h
index 1b426a37fa..7b74c1f7ba 100644
--- a/Source/Core/Core/Src/HW/PixelEngine.h
+++ b/Source/Core/Core/Src/HW/PixelEngine.h
@@ -17,7 +17,7 @@
 #ifndef _PIXELENGINE_H
 #define _PIXELENGINE_H
 
-#include "Common.h"
+#include "CommonTypes.h"
 class PointerWrap;
 
 namespace PixelEngine
@@ -33,7 +33,7 @@ void HWCALL Write16(const u16 _iValue, const u32 _iAddress);
 void HWCALL Write32(const u32 _iValue, const u32 _iAddress);
 
 // gfx plugin support
-void SetToken(const unsigned __int16 _token, const int _bSetTokenAcknowledge);
+void SetToken(const u16 _token, const int _bSetTokenAcknowledge);
 void SetFinish(void);
 bool AllowIdleSkipping();
 
diff --git a/Source/PluginSpecs/CommonTypes.h b/Source/PluginSpecs/CommonTypes.h
index 133968f359..8aaa28bd59 100644
--- a/Source/PluginSpecs/CommonTypes.h
+++ b/Source/PluginSpecs/CommonTypes.h
@@ -48,7 +48,6 @@ typedef unsigned long long u64;
 
 typedef char s8;
 typedef short s16;
-#define __int16 short
 typedef int s32;
 #define __int32 int
 typedef long long s64;
diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp b/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp
index f27e860f64..c22281b5b8 100644
--- a/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp
+++ b/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp
@@ -16,6 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "Globals.h"
+#include "CommonTypes.h"
 
 #include "gdsp_interpreter.h"
 #include "gdsp_interface.h"
@@ -32,7 +33,6 @@ CDisAsmDlg g_Dialog;
 #else
 #define WINAPI
 #define LPVOID void*
-#define __int16 short;
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -220,30 +220,18 @@ void DSP_Shutdown(void)
 	}
 }
 
-#ifdef _WIN32
-unsigned __int16 DSP_WriteControlRegister(unsigned __int16 _uFlag)
-#else
-short unsigned int DSP_WriteControlRegister(short _uFlag)
-#endif 
+u16 DSP_WriteControlRegister(u16 _uFlag)
 {
 	gdsp_write_cr(_uFlag);
 	return(gdsp_read_cr());
 }
 
-#ifdef _WIN32
-unsigned __int16 DSP_ReadControlRegister()
-#else
-short unsigned int DSP_ReadControlRegister()
-#endif
+u16 DSP_ReadControlRegister()
 {
 	return(gdsp_read_cr());
 }
 
-#ifdef _WIN32
-unsigned __int16 DSP_ReadMailboxHigh(bool _CPUMailbox)
-#else
-short unsigned int DSP_ReadMailboxHigh(bool _CPUMailbox)
-#endif
+u16 DSP_ReadMailboxHigh(bool _CPUMailbox)
 {
 	if (_CPUMailbox)
 	{
@@ -255,11 +243,7 @@ short unsigned int DSP_ReadMailboxHigh(bool _CPUMailbox)
 	}
 }
 
-#ifdef _WIN32
-unsigned __int16 DSP_ReadMailboxLow(bool _CPUMailbox)
-#else
-short unsigned int DSP_ReadMailboxLow(bool _CPUMailbox)
-#endif
+u16 DSP_ReadMailboxLow(bool _CPUMailbox)
 {
 	if (_CPUMailbox)
 	{
@@ -271,11 +255,7 @@ short unsigned int DSP_ReadMailboxLow(bool _CPUMailbox)
 	}
 }
 
-#ifdef _WIN32
-void DSP_WriteMailboxHigh(bool _CPUMailbox, unsigned __int16 _uHighMail)
-#else
-void DSP_WriteMailboxHigh(bool _CPUMailbox, short unsigned int _uHighMail)
-#endif
+void DSP_WriteMailboxHigh(bool _CPUMailbox, u16 _uHighMail)
 {
 	if (_CPUMailbox)
 	{
@@ -292,11 +272,7 @@ void DSP_WriteMailboxHigh(bool _CPUMailbox, short unsigned int _uHighMail)
 	}
 }
 
-#ifdef _WIN32
-void DSP_WriteMailboxLow(bool _CPUMailbox, unsigned __int16 _uLowMail)
-#else
-void DSP_WriteMailboxLow(bool _CPUMailbox, short unsigned int _uLowMail)
-#endif
+void DSP_WriteMailboxLow(bool _CPUMailbox, u16 _uLowMail)
 {
 	if (_CPUMailbox)
 	{
@@ -325,11 +301,7 @@ void DSP_Update(int cycles)
 	#endif
 }
 
-#ifdef _WIN32
 void DSP_SendAIBuffer(unsigned int address, int sample_rate)
-#else
-void DSP_SendAIBuffer(unsigned int address, int sample_rate)
-#endif
 {
 	// uint32 Size = _Size * 16 * 2; // 16bit per sample, two channels