diff options
| author | Leo C | 2016-09-08 20:59:55 +0200 |
|---|---|---|
| committer | Leo C | 2016-09-08 20:59:55 +0200 |
| commit | b30c4e8f1aef96f6fdc93da9f125545f5f74d06e (patch) | |
| tree | e1f9e4cfcc0c24cfb8f35825d83aa5f878c2717a /include/integer.h | |
| parent | e1deb7c3bc0500aabf5d099adb231f6d1d27f01d (diff) | |
| parent | 70702af1370e44e32fb2c3c507e4759a187b4fe5 (diff) | |
| download | z180-stamp-b30c4e8f1aef96f6fdc93da9f125545f5f74d06e.zip | |
Merge branch 'chan-fatfs' into fatfs-integration
# Conflicts:
# .gitignore
# fatfs/src/diskio.h
# fatfs/src/option/ccsbcs.c
# include/avr/ffconf.h
# include/integer.h
Diffstat (limited to 'include/integer.h')
| -rw-r--r-- | include/integer.h | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/include/integer.h b/include/integer.h index a263f7c..4660ed6 100644 --- a/include/integer.h +++ b/include/integer.h @@ -5,22 +5,34 @@ #ifndef _FF_INTEGER
#define _FF_INTEGER
-#include <stdint.h>
+#ifdef _WIN32 /* FatFs development platform */
-/* This type MUST be 8 bit */
-typedef uint8_t BYTE;
+#include <windows.h>
+#include <tchar.h>
+typedef unsigned __int64 QWORD;
-/* These types MUST be 16 bit */
-typedef int16_t SHORT;
-typedef uint16_t WORD;
-typedef uint16_t WCHAR;
-/* These types MUST be 16 bit or 32 bit */
-typedef int INT;
+#else /* Embedded platform */
+
+/* These types MUST be 16-bit or 32-bit */
+typedef int INT;
typedef unsigned int UINT;
-/* These types MUST be 32 bit */
-typedef int32_t LONG;
-typedef uint32_t DWORD;
+/* This type MUST be 8-bit */
+typedef unsigned char BYTE;
+
+/* These types MUST be 16-bit */
+typedef short SHORT;
+typedef unsigned short WORD;
+typedef unsigned short WCHAR;
+
+/* These types MUST be 32-bit */
+typedef long LONG;
+typedef unsigned long DWORD;
+
+/* This type MUST be 64-bit (Remove this for C89 compatibility) */
+typedef unsigned long long QWORD;
+
+#endif
#endif
|