diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-05-03 22:03:17 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-05-11 16:27:22 +0400 |
| commit | 240198615a43e333d0da22adf73028406b053ad2 (patch) | |
| tree | 0df5a80b35102aee342b96c531e938a0e5ebc646 | |
| parent | ac603781bb445cde0611f62b9fc267c688e7d11d (diff) | |
Remove unneeded typedef.
| -rw-r--r-- | src/mpc-hc/Ifo.cpp | 4 | ||||
| -rw-r--r-- | src/mpc-hc/Ifo.h | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/mpc-hc/Ifo.cpp b/src/mpc-hc/Ifo.cpp index 9c33fd726..228437114 100644 --- a/src/mpc-hc/Ifo.cpp +++ b/src/mpc-hc/Ifo.cpp @@ -70,9 +70,9 @@ extern HANDLE(__stdcall* Real_CreateFileW)(LPCWSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile);
-unsigned __int32 get4bytes(const BYTE* buf)
+uint32_t get4bytes(const BYTE* buf)
{
- return be2me_32(*((unsigned __int32*)buf));
+ return be2me_32(*((uint32_t*)buf));
}
diff --git a/src/mpc-hc/Ifo.h b/src/mpc-hc/Ifo.h index 0323c016c..6e553877a 100644 --- a/src/mpc-hc/Ifo.h +++ b/src/mpc-hc/Ifo.h @@ -1,5 +1,5 @@ /*
- * (C) 2008-2012 see Authors.txt
+ * (C) 2008-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -20,12 +20,13 @@ #pragma once
-#pragma pack(1)
-
+// TODO: remove this when it's fixed in MSVC
+// Work around warning C4005: 'XXXX' : macro redefinition
+#pragma warning(disable: 4005)
+#include <stdint.h>
+#pragma warning(default: 4005)
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int32 uint32_t;
+#pragma pack(1)
class CIfo
|