Diff: ChaN/integer.h

Revision:

5:b3b3370574cf

Parent:

1:46ce1e16c870

Child:

6:a5fcdbf92056

diff -r 3ff2606d5713 -r b3b3370574cf ChaN/integer.h
--- a/ChaN/integer.h	Thu Aug 28 13:15:31 2014 +0100
+++ b/ChaN/integer.h	Thu Aug 13 10:15:39 2015 +0100
@@ -2,36 +2,33 @@
 /* Integer type definitions for FatFs module */
 /*-------------------------------------------*/
 
-#ifndef _INTEGER
-#define _INTEGER
+#ifndef _FF_INTEGER
+#define _FF_INTEGER
 
-#ifdef _WIN32    /* FatFs development platform */
+#ifdef _WIN32	/* FatFs development platform */
 
 #include <windows.h>
 #include <tchar.h>
 
-#else            /* Embedded platform */
+#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;
-typedef unsigned char   BYTE;
+/* This type MUST be 8 bit */
+typedef unsigned char	BYTE;
 
-/* These types must be 16-bit integer */
-typedef short           SHORT;
-typedef unsigned short  USHORT;
-typedef unsigned short  WORD;
-typedef unsigned short  WCHAR;
+/* These types MUST be 16 bit */
+typedef short			SHORT;
+typedef unsigned short	WORD;
+typedef unsigned short	WCHAR;
 
-/* These types must be 32-bit integer */
-typedef long            LONG;
-typedef unsigned long   ULONG;
-typedef unsigned long   DWORD;
+/* 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	DWORD;
 
 #endif
 
 #endif
+