From 2347d1a709ee3c39efbdaec51eb017c19eb1d24e Mon Sep 17 00:00:00 2001 From: David Quintana Date: Tue, 8 Sep 2015 10:26:12 +0000 Subject: [PATCH] [FATTEN] * Switch to using our existing host-tools header for types. Thanks Colin for pointing me to the right header (it was discrete so I missed it when looking). svn path=/trunk/; revision=69112 --- reactos/tools/fatten/fatfs/diskio.h | 2 +- reactos/tools/fatten/fatfs/ff.h | 2 +- reactos/tools/fatten/fatfs/integer.h | 35 ---------------------------- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 reactos/tools/fatten/fatfs/integer.h diff --git a/reactos/tools/fatten/fatfs/diskio.h b/reactos/tools/fatten/fatfs/diskio.h index 9c5ca43c5c4..5db45dac831 100644 --- a/reactos/tools/fatten/fatfs/diskio.h +++ b/reactos/tools/fatten/fatfs/diskio.h @@ -12,7 +12,7 @@ extern "C" { #define _USE_WRITE 1 /* 1: Enable disk_write function */ #define _USE_IOCTL 1 /* 1: Enable disk_ioctl fucntion */ -#include "integer.h" +#include /* Status of Disk Functions */ diff --git a/reactos/tools/fatten/fatfs/ff.h b/reactos/tools/fatten/fatfs/ff.h index 2cd04463a7a..9b47225ca69 100644 --- a/reactos/tools/fatten/fatfs/ff.h +++ b/reactos/tools/fatten/fatfs/ff.h @@ -21,7 +21,7 @@ extern "C" { #endif -#include "integer.h" /* Basic integer types */ +#include /* Basic integer types */ #include "ffconf.h" /* FatFs configuration options */ #if _FATFS != _FFCONF diff --git a/reactos/tools/fatten/fatfs/integer.h b/reactos/tools/fatten/fatfs/integer.h deleted file mode 100644 index 494f56c5f00..00000000000 --- a/reactos/tools/fatten/fatfs/integer.h +++ /dev/null @@ -1,35 +0,0 @@ -/*-------------------------------------------*/ -/* Integer type definitions for FatFs module */ -/*-------------------------------------------*/ - -#ifndef _FF_INTEGER -#define _FF_INTEGER - -#if defined(_MSC_VER) && (_MSC_VER < 0x1700) /* Windows with older MSVC */ - -#include -#include - -#else /* Unixes */ - -#include - -/* This type MUST be 8 bit */ -typedef uint8_t BYTE; - -/* These types MUST be 16 bit */ -typedef int16_t SHORT; -typedef uint16_t WORD; -typedef uint16_t WCHAR; - -/* These types MUST be at least 16 bit */ -typedef int_fast16_t INT; -typedef uint_fast16_t UINT; - -/* These types MUST be 32 bit */ -typedef int32_t LONG; -typedef uint32_t DWORD; - -#endif - -#endif