[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 01/11] stdint: check _INTPTR_T_DECLARED before defining intptr
From: |
KO Myung-Hun |
Subject: |
[PATCH v7 01/11] stdint: check _INTPTR_T_DECLARED before defining intptr_t and uintptr_t |
Date: |
Thu, 14 Jan 2016 11:23:41 +0900 |
OS/2 kLIBC's stdint.h defines _INTPTR_T_DECLARED and needs its own
definitions of intptr_t and uintptr_t (which use int and unsigned)
to avoid clashes with declarations of system functions like sbrk.
* lib/stdint.in.h (intptr_t, uintptr_t): Check
_INTPTR_T_DECLARED before defining them.
---
lib/stdint.in.h | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/lib/stdint.in.h b/lib/stdint.in.h
index d20d1c7..03a6087 100644
--- a/lib/stdint.in.h
+++ b/lib/stdint.in.h
@@ -288,12 +288,17 @@ typedef gl_uint_fast32_t gl_uint_fast16_t;
/* 7.18.1.4. Integer types capable of holding object pointers */
-#undef intptr_t
-#undef uintptr_t
+/* kLIBC's stdint.h defines _INTPTR_T_DECLARED and needs its own
+ definitions of intptr_t and uintptr_t (which use int and unsigned)
+ to avoid clashes with declarations of system functions like sbrk. */
+#ifndef _INTPTR_T_DECLARED
+# undef intptr_t
+# undef uintptr_t
typedef long int gl_intptr_t;
typedef unsigned long int gl_uintptr_t;
-#define intptr_t gl_intptr_t
-#define uintptr_t gl_uintptr_t
+# define intptr_t gl_intptr_t
+# define uintptr_t gl_uintptr_t
+#endif
/* 7.18.1.5. Greatest-width integer types */
--
2.7.0
- [PATCH v7 00/11] OS/2 patches, KO Myung-Hun, 2016/01/13
- [PATCH v7 02/11] binary-io: don't put fd in binary mode if it is a console on EMX, KO Myung-Hun, 2016/01/13
- [PATCH v7 01/11] stdint: check _INTPTR_T_DECLARED before defining intptr_t and uintptr_t,
KO Myung-Hun <=
- [PATCH v7 03/11] pipe-filter-aux: undefine HAVE_SELECT on KLIBC, KO Myung-Hun, 2016/01/13
- [PATCH v7 04/11] w32spawn: clear SHELL_SPECIAL_CHARS and SHELL_SPACE_CHAR on OS/2 kLIBC, KO Myung-Hun, 2016/01/13
- [PATCH v7 05/11] wchar: fix 'conflicting types' error for `__wcwidth' on OS/2 kLIBC, KO Myung-Hun, 2016/01/13
- [PATCH v7 06/11] pipe_filter_ii_execute: port to OS/2 kLIBC, KO Myung-Hun, 2016/01/13
- [PATCH v7 08/11] openat_proc_name: port to OS/2 kLIBC, KO Myung-Hun, 2016/01/13