Changeset e9690b6 in mainline

Timestamp:

2017-10-25T00:25:10Z (7 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7c50de5a

Parents:

1c95fd0

Message:

Allow disabling intmax_t in downstream code (used in coastline).

Location:

abi/include/_bits

Files:

• inttypes.h (modified) (3 diffs)
• macros.h (modified) (2 diffs)
• stdint.h (modified) (2 diffs)

abi/include/_bits/inttypes.h

@@ -44 +44 @@
 #include <_bits/wchar_t.h>
 
-typedef struct {
-        intmax_t quot;
-        intmax_t rem;
-} imaxdiv_t;
-
 #define PRId8       __PRId8__
 #define PRIdLEAST8  __PRId8__
@@ -237 +232 @@
 #define SCNxPTR  __SCNxPTR__
 
+#ifndef __HELENOS_DISABLE_INTMAX__
+
 #define PRIdMAX  __PRIdMAX__
 #define PRIiMAX  __PRIiMAX__
@@ -249 +246 @@
 #define SCNxMAX  __SCNxMAX__
 
+typedef struct {
+        intmax_t quot;
+        intmax_t rem;
+} imaxdiv_t;
+
+#endif  /* __HELENOS_DISABLE_INTMAX__ */
+
 #endif
 

abi/include/_bits/macros.h

@@ -578 +578 @@
 #endif
 
+#ifndef __HELENOS_DISABLE_INTMAX__
+
 #if !defined(__INTMAX_TYPE__) || !defined(__INTMAX_MAX__)
 #error HelenOS expects __INTMAX_TYPE__ and __INTMAX_MAX__ \
@@ -640 +642 @@
 #define __SCNxMAX__  "jx"
 
+#endif  /* __HELENOS_DISABLE_INTMAX__ */
+
 #ifndef __SIZEOF_FLOAT__
 #error HelenOS expects __SIZEOF_FLOAT__ to be defined.

abi/include/_bits/stdint.h

@@ -155 +155 @@
 #define UINTPTR_MAX  __UINTPTR_MAX__
 
+#ifndef __HELENOS_DISABLE_INTMAX__
+
 typedef __INTMAX_TYPE__  intmax_t;
 typedef __UINTMAX_TYPE__ uintmax_t;
@@ -165 +167 @@
 #define INTMAX_C(x)   __INTMAX_C(x)
 #define UINTMAX_C(x)  __UINTMAX_C(x)
+
+#endif  /* __HELENOS_DISABLE_INTMAX__ */
 
 #define PTRDIFF_MIN  __PTRDIFF_MIN__