From d3cbb81f0c9bbc273a633eefa6800a8d4bbb9f80 Mon Sep 17 00:00:00 2001 From: "fires.gc" Date: Tue, 14 Oct 2008 06:10:02 +0000 Subject: [PATCH] a missing file... git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@860 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../DolphinWX/Src/MemoryCards/GCMemcard.h | 31 +------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h index fafb0d37ab..0d9641e992 100644 --- a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h +++ b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h @@ -15,38 +15,9 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ - #pragma once -typedef unsigned char u8; -typedef unsigned short u16; -typedef unsigned int u32; - - -#define ArrayByteSwap(a) (ByteSwap(a, a+sizeof(u8))); - -void ByteSwap(u8 *valueA, u8 *valueB); - -u16 __inline bswap16(u16 s) -{ - return (s>>8) | (s<<8); -} - -u32 __inline bswap32(u32 s) -{ - return (u32)bswap16((u16)(s>>16)) | ((u32)bswap16((u16)s)<<16); -} - -#ifndef max -template -T __inline max(T a, T b) -{ - return (b>a)?b:a; -} -#endif - -#define BE16(x) ((u16((x)[0])<<8) | u16((x)[1])) -#define BE32(x) ((u32((x)[0])<<24) | (u32((x)[1])<<16) | (u32((x)[2])<<8) | u32((x)[3])) +#include "Common.h" class GCMemcard {