From 3fe8c971f275e7f2069033c4064859c5aad9e8cc Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Thu, 23 Feb 2006 09:12:21 +0000
Subject: Cleanup to remove duplicate type defines

svn-id: r20821
---
 engines/cine/flip_support.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'engines/cine/flip_support.cpp')

diff --git a/engines/cine/flip_support.cpp b/engines/cine/flip_support.cpp
index decd04d057..27d6a9d985 100644
--- a/engines/cine/flip_support.cpp
+++ b/engines/cine/flip_support.cpp
@@ -24,34 +24,34 @@
 
 #include "cine/cine.h"
 
-void flipU16(u16 * pVar) {
+void flipU16(uint16 * pVar) {
 	*pVar = (((*pVar) & 0xFF) << 8) | (((*pVar) & 0xFF00) >> 8);
 }
 
-void flipU32(u32 * pVar) {
-	u16 part1;
-	u16 part2;
+void flipU32(uint32 * pVar) {
+	uint16 part1;
+	uint16 part2;
 
-	part1 = (u16) ((*pVar) & 0xFFFF);
-	part2 = (u16) (((*pVar) & 0xFFFF0000) >> 16);
+	part1 = (uint16) ((*pVar) & 0xFFFF);
+	part2 = (uint16) (((*pVar) & 0xFFFF0000) >> 16);
 
 	flipU16(&part1);
 	flipU16(&part2);
 
-	*pVar = (part2) | ((u32) part1 << 16);
+	*pVar = (part2) | ((uint32) part1 << 16);
 }
 
-u16 readU16LE(const void *ptr) {
-	const u8 *b = (const u8 *)ptr;
+uint16 readU16LE(const void *ptr) {
+	const uint8 *b = (const uint8 *)ptr;
 	return (b[1] << 8) | b[0];
 }
 
-u16 readU16BE(const void *ptr) {
-	const u8 *b = (const u8 *)ptr;
+uint16 readU16BE(const void *ptr) {
+	const uint8 *b = (const uint8 *)ptr;
 	return (b[0] << 8) | b[1];
 }
 
-u32 readU32BE(const void *ptr) {
-	const u8 *b = (const u8 *)ptr;
+uint32 readU32BE(const void *ptr) {
+	const uint8 *b = (const uint8 *)ptr;
 	return (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3];
 }
-- 
cgit v1.2.3