From 20ebc8d7b575ffe7e95b33346a051dcd23a4ec76 Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 28 Mar 2017 07:58:00 -0400 Subject: [PATCH] manual picking from ChibiOS migration branch --- firmware/ext/integer.h | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/firmware/ext/integer.h b/firmware/ext/integer.h index 16ad408233..f254b2a028 100644 --- a/firmware/ext/integer.h +++ b/firmware/ext/integer.h @@ -2,8 +2,8 @@ /* Integer type definitions for FatFs module */ /*-------------------------------------------*/ -#ifndef _INTEGER -#define _INTEGER +#ifndef _FF_INTEGER +#define _FF_INTEGER #ifdef _WIN32 /* FatFs development platform */ @@ -12,24 +12,20 @@ #else /* Embedded platform */ -/* These types must be 16-bit, 32-bit or larger integer */ -typedef int INT; -typedef unsigned int UINT; - -/* These types must be 8-bit integer */ -typedef char CHAR; -typedef unsigned char UCHAR; +/* This type MUST be 8 bit */ typedef unsigned char BYTE; -/* These types must be 16-bit integer */ +/* These types MUST be 16 bit */ typedef short SHORT; -typedef unsigned short USHORT; typedef unsigned short WORD; typedef unsigned short WCHAR; -/* These types must be 32-bit integer */ +/* These types MUST be 16 bit or 32 bit */ +typedef int INT; +typedef unsigned int UINT; + +/* These types MUST be 32 bit */ typedef long LONG; -typedef unsigned long ULONG; typedef unsigned long DWORD; #endif