mirror of
https://github.com/apache/nuttx.git
synced 2026-06-05 15:58:59 +08:00
Changing NuttX fixed size type names to C99 standard names -- things will be broken for awhile
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2335 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
@@ -37,8 +37,8 @@
|
||||
* through sys/types.h
|
||||
*/
|
||||
|
||||
#ifndef __ARCH_SH_INCLUDE_SH1_TYPES_H
|
||||
#define __ARCH_SH_INCLUDE_SH1_TYPES_H
|
||||
#ifndef __ARCH_SH_INCLUDE_M16C_TYPES_H
|
||||
#define __ARCH_SH_INCLUDE_M16C_TYPES_H
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
@@ -54,29 +54,40 @@
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
/* These are the sizes of the standard GNU types. int is 16-bits and
|
||||
* long is 32-bits */
|
||||
/* These are the sizes of the standard integer types. NOTE that these type
|
||||
* names have a leading underscore character. This file will be included
|
||||
* (indirectly) by include/stdint.h and typedef'ed to the final name without
|
||||
* the underscore character. This roundabout way of doings things allows
|
||||
* the stdint.h to be removed from the include/ directory in the event that
|
||||
* the user prefers to use the definitions provided by their toolchain header
|
||||
* files
|
||||
*
|
||||
* int is 16-bits and long is 32-bits
|
||||
*/
|
||||
|
||||
typedef char sbyte;
|
||||
typedef unsigned char ubyte;
|
||||
typedef unsigned char uint8;
|
||||
typedef unsigned char boolean;
|
||||
typedef int sint16;
|
||||
typedef unsigned int uint16;
|
||||
typedef long sint32;
|
||||
typedef unsigned long uint32;
|
||||
typedef long long sint64;
|
||||
typedef unsigned long long uint64;
|
||||
typedef char _int8_t;
|
||||
typedef unsigned char _uint8_t;
|
||||
|
||||
typedef int _int16_t;
|
||||
typedef unsigned int _uint16_t;
|
||||
|
||||
typedef long _int32_t;
|
||||
typedef unsigned long _uint32_t;
|
||||
|
||||
typedef long long _int64_t;
|
||||
typedef unsigned long long _uint64_t;
|
||||
#define __INT64_DEFINED
|
||||
|
||||
/* A pointer is 2 bytes */
|
||||
|
||||
typedef unsigned int uintptr;
|
||||
typedef unsigned int _intptr_t;
|
||||
typedef unsigned int _uintptr_t;
|
||||
|
||||
/* This is the size of the interrupt state save returned by
|
||||
* irqsave()
|
||||
*/
|
||||
|
||||
typedef uint16 irqstate_t;
|
||||
typedef _uint16_t irqstate_t;
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
@@ -84,4 +95,4 @@ typedef uint16 irqstate_t;
|
||||
* Global Function Prototypes
|
||||
****************************************************************************/
|
||||
|
||||
#endif /* __ARCH_SH_INCLUDE_SH1_TYPES_H */
|
||||
#endif /* __ARCH_SH_INCLUDE_M16C_TYPES_H */
|
||||
|
||||
+23
-13
@@ -54,28 +54,38 @@
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
/* These are the sizes of the standard GNU types */
|
||||
/* These are the sizes of the standard integer types. NOTE that these type
|
||||
* names have a leading underscore character. This file will be included
|
||||
* (indirectly) by include/stdint.h and typedef'ed to the final name without
|
||||
* the underscore character. This roundabout way of doings things allows
|
||||
* the stdint.h to be removed from the include/ directory in the event that
|
||||
* the user prefers to use the definitions provided by their toolchain header
|
||||
* files
|
||||
*/
|
||||
|
||||
typedef char sbyte;
|
||||
typedef unsigned char ubyte;
|
||||
typedef unsigned char uint8;
|
||||
typedef unsigned char boolean;
|
||||
typedef short sint16;
|
||||
typedef unsigned short uint16;
|
||||
typedef int sint32;
|
||||
typedef unsigned int uint32;
|
||||
typedef long long sint64;
|
||||
typedef unsigned long long uint64;
|
||||
typedef char _int8_t;
|
||||
typedef unsigned char _uint8_t;
|
||||
|
||||
typedef short _int16_t;
|
||||
typedef unsigned short _uint16_t;
|
||||
|
||||
typedef int _int32_t;
|
||||
typedef unsigned int _uint32_t;
|
||||
|
||||
typedef long long _int64_t;
|
||||
typedef unsigned long long _uint64_t;
|
||||
#define __INT64_DEFINED
|
||||
|
||||
/* A pointer is 4 bytes */
|
||||
|
||||
typedef unsigned int uintptr;
|
||||
typedef int _intptr_t;
|
||||
typedef unsigned int _uintptr_t;
|
||||
|
||||
/* This is the size of the interrupt state save returned by
|
||||
* irqsave()
|
||||
*/
|
||||
|
||||
typedef unsigned long irqstate_t;
|
||||
typedef unsigned long irqstate_t;
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user