[haiku-development] patch to stdint.h and issues
- From: "Curtis Wanner" <katisu@xxxxxxxxxxx>
- To: haiku-development@xxxxxxxxxxxxx
- Date: Thu, 13 Mar 2008 20:53:47 EST
Alright, I updated stdint.h as much as possible to the C99 standard.
Added some additional limit macros and the constant macros.
According to the standard, the limit macros should not be defined for C
++ unless __STDC_LIMIT_MACROS is defined. Since Mediadefs.cpp and
STXTTranslator.cpp use these, I added #define __STDC_LIMIT_MACROS to
these files (otherwise it breaks build).
Also, the standard says WCHAR_MIN and WCHAR_MAX are to be defined here,
but I get a mess of warnings since glibc appears to define them first.
Not sure the best way to resolve this at this point, so I commented
those two out for the moment and put a ToDo.
Since int32_t and uint32_t were changed from long to int type (by Axel
in r22643), I removed the L suffix from INT32_MAX and UINT32_MAX while
I was at it. Hope it was alright to do this in the same patch.
Attached are diffs to stdint.h, Mediadefs.cpp, and STXTTranslator.cpp.
Curtis
Index: trunk/headers/posix/stdint.h
===================================================================
--- trunk/headers/posix/stdint.h (revision 24383)
+++ trunk/headers/posix/stdint.h (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2007, Haiku Inc. All Rights Reserved.
+ * Copyright 2003-2008, Haiku Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _STDINT_H_
@@ -9,123 +9,156 @@
/* ToDo: this is a compiler and architecture dependent header */
/* Exact-width integer types */
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+
+/* Minimum-width integer types */
+typedef int8_t int_least8_t;
+typedef uint8_t uint_least8_t;
+
+typedef int16_t int_least16_t;
+typedef uint16_t uint_least16_t;
+
+typedef int32_t int_least32_t;
+typedef uint32_t uint_least32_t;
+
+typedef int64_t int_least64_t;
+typedef uint64_t uint_least64_t;
+
+/* Fastest minimum-width integer types */
+typedef int32_t int_fast8_t;
+typedef uint32_t uint_fast8_t;
+
+typedef int32_t int_fast16_t;
+typedef uint32_t uint_fast16_t;
+
+typedef int32_t int_fast32_t;
+typedef uint32_t uint_fast32_t;
+
+typedef int64_t int_fast64_t;
+typedef uint64_t uint_fast64_t;
+
+/* Integer types capable of holding object pointers */
+typedef int32_t intptr_t;
+typedef uint32_t uintptr_t;
+
+/* Greatest-width integer types */
+typedef signed long long intmax_t;
+typedef unsigned long long uintmax_t;
+
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
+
+/* Limits of exact-width integer types */
#define INT8_MIN (-128)
#define INT8_MAX (127)
#define UINT8_MAX (255U)
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-
#define INT16_MIN (-32768)
#define INT16_MAX (32767)
#define UINT16_MAX (65535U)
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-
-#define INT32_MAX (2147483647L)
+#define INT32_MAX (2147483647)
#define INT32_MIN (-INT32_MAX-1)
-#define UINT32_MAX (4294967295UL)
+#define UINT32_MAX (4294967295U)
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-
#define INT64_MAX (9223372036854775807LL)
#define INT64_MIN (-INT64_MAX-1)
#define UINT64_MAX (18446744073709551615ULL)
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-
-
-/* Minimum-width integer types */
-
+/* Limits of minimum-width integer types */
#define INT_LEAST8_MIN INT8_MIN
#define INT_LEAST8_MAX INT8_MAX
#define UINT_LEAST8_MAX UINT8_MAX
-typedef int8_t int_least8_t;
-typedef uint8_t uint_least8_t;
-
#define INT_LEAST16_MIN INT16_MIN
#define INT_LEAST16_MAX INT16_MAX
#define UINT_LEAST16_MAX UINT16_MAX
-typedef int16_t int_least16_t;
-typedef uint16_t uint_least16_t;
-
#define INT_LEAST32_MIN INT32_MIN
#define INT_LEAST32_MAX INT32_MAX
#define UINT_LEAST32_MAX UINT32_MAX
-typedef int32_t int_least32_t;
-typedef uint32_t uint_least32_t;
-
#define INT_LEAST64_MIN INT64_MIN
#define INT_LEAST64_MAX INT64_MAX
#define UINT_LEAST64_MAX UINT64_MAX
-typedef int64_t int_least64_t;
-typedef uint64_t uint_least64_t;
-
-
-/* Fastest minimum-width integer types */
-
+/* Limits of fastest minimum-width integer types */
#define INT_FAST8_MIN INT8_MIN
#define INT_FAST8_MAX INT8_MAX
#define UINT_FAST8_MAX UINT8_MAX
-typedef int32_t int_fast8_t;
-typedef uint32_t uint_fast8_t;
-
#define INT_FAST16_MIN INT16_MIN
#define INT_FAST16_MAX INT16_MAX
#define UINT_FAST16_MAX UINT16_MAX
-typedef int32_t int_fast16_t;
-typedef uint32_t uint_fast16_t;
-
#define INT_FAST32_MIN INT32_MIN
#define INT_FAST32_MAX INT32_MAX
#define UINT_FAST32_MAX UINT32_MAX
-typedef int32_t int_fast32_t;
-typedef uint32_t uint_fast32_t;
-
#define INT_FAST64_MIN INT64_MIN
#define INT_FAST64_MAX INT64_MAX
#define UINT_FAST64_MAX UINT64_MAX
-typedef int64_t int_fast64_t;
-typedef uint64_t uint_fast64_t;
-
-
-/* Integer types capable of holding object pointers */
-
+/* Limits of Integer types capable of holding object pointers */
#define INTPTR_MIN INT32_MIN
#define INTPTR_MAX INT32_MAX
#define UINTPTR_MAX UINT32_MAX
-typedef int32_t intptr_t;
-typedef uint32_t uintptr_t;
-
-
-/* Greatest-width integer types */
-
+/* Limits of Greatest-width integer types */
#define INTMAX_MIN INT64_MIN
#define INTMAX_MAX INT64_MAX
#define UINTMAX_MAX UINT64_MAX
-typedef signed long long intmax_t;
-typedef unsigned long long uintmax_t;
+/* Limits of other integer types */
+#define PTDIFF_MIN INT32_MIN
+#define PTDIFF_MAX INT32_MAX
-/* Other types */
+#define SIG_ATOMIC_MIN INT32_MIN
+#define SIG_ATOMIC_MAX INT32_MAX
+
#define SIZE_MAX UINT32_MAX
+/* ToDo: Resolve redefine warnings with glibc definitions of
+ WCHAR_MIN and WCHAR_MAX */
+//#define WCHAR_MIN 0
+//#define WCHAR_MAX ((wchar_t)-1)
+#define WINT_MIN 0
+#define WINT_MAX ((wint_t)-1)
+
+#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */
+
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
+
+// Macros of Integer Constant Expressions
+#define INT8_C(value) value
+#define INT16_C(value) value
+#define INT32_C(value) value
+#define INT64_C(value) value ## LL
+
+#define UINT8_C(value) value ## U
+#define UINT16_C(value) value ## U
+#define UINT32_C(value) value ## U
+#define UINT64_C(value) value ## ULL
+
+// Macros for greatest-width integer constant expressions
+#define INTMAX_C(value) value ## LL
+#define UINTMAX_C(value) value ## ULL
+
+#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */
+
+
/* BSD compatibility */
-
typedef uint8_t u_int8_t;
typedef uint16_t u_int16_t;
typedef uint32_t u_int32_t;
Index: trunk/src/kits/media/MediaDefs.cpp
===================================================================
--- trunk/src/kits/media/MediaDefs.cpp (revision 24383)
+++ trunk/src/kits/media/MediaDefs.cpp (working copy)
@@ -3,6 +3,8 @@
* FILE: MediaDefs.cpp
* DESCR:
***********************************************************************/
+#define __STDC_LIMIT_MACROS
+
#include <MediaDefs.h>
#include <MediaNode.h>
#include <Roster.h>
Index: trunk/src/add-ons/translators/stxt/STXTTranslator.cpp
===================================================================
--- trunk/src/add-ons/translators/stxt/STXTTranslator.cpp (revision 24383)
+++ trunk/src/add-ons/translators/stxt/STXTTranslator.cpp (working copy)
@@ -6,8 +6,8 @@
* Michael Wilber
* Axel Dörfler, axeld@xxxxxxxxxxxxxxxx
*/
+#define __STDC_LIMIT_MACROS
-
#include "STXTTranslator.h"
#include "STXTView.h"
Other related posts:
