Changeset 96017 in vbox

Timestamp:

Aug 4, 2022 2:24:26 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

152811

Message:

include/iprt/nocrt: Header build fixes for windows. bugref:10261

Location:

trunk/include/iprt/nocrt

Files:

trunk/include/iprt/nocrt/fcntl.h

-              r96013
+              r96017
 # endif
+RT_C_DECLS_END
 #endif /* IPRT_NO_CRT_FOR_3RD_PARTY */
-RT_C_DECLS_END
 #endif /* !IPRT_INCLUDED_nocrt_fcntl_h */

-              r95975
+              r96017
 #define LLONG_MIN       (INT64_C(-0x7fffffffffffffff) - 1)
+#undef   SIZE_MAX
+#undef   SIZE_T_MAX
+#undef   SSIZE_MAX
+#undef   INTPTR_MAX
+#undef   UINTPTR_MAX
 #if ARCH_BITS == 32
 # define SIZE_T_MAX     0xffffffffU
 …
 # define UINTPTR_MAX    0xffffffffU
 #elif ARCH_BITS == 64
-# define SIZE_T_MAX     UINT64_C(0xffffffffffffffff)
 # define SIZE_T_MAX     UINT64_C(0xffffffffffffffff)
 # define SSIZE_MAX      INT64_C(0x7fffffffffffffff)

-              r95976
+              r96017
 /* Just map it onto stdlib.h and alloca.h for now. */
 #include <stdlib.h>
+#include <iprt/alloca.h>
+#ifdef IN_RING3
+# include <iprt/alloca.h>
+#endif
 #endif /* !IPRT_INCLUDED_nocrt_malloc_h */

-              r95975
+              r96017
 #include <iprt/types.h>
+#define offsetof(a_Type, a_Member) RT_OFFSETOF(a_Type, a_Member)
+#ifndef offsetof
+# define offsetof(a_Type, a_Member) RT_OFFSETOF(a_Type, a_Member)
+#endif
 #endif /* !IPRT_INCLUDED_nocrt_stddef_h */

-              r96013
+              r96017
 # endif
+RT_C_DECLS_END
 #endif /* IPRT_NO_CRT_FOR_3RD_PARTY */
-RT_C_DECLS_END
 #endif /* !IPRT_INCLUDED_nocrt_sys_stat_h */

-              r96013
+              r96017
 #include <iprt/types.h>
+#if !defined(_DEV_T_DEFINED)
 typedef RTDEV       dev_t;
+#endif
+#if !defined(_UCRT_RESTORE_CLANG_WARNINGS)
 typedef int         errno_t;
+#endif
+#if !defined(_INO_T_DEFINED)
 typedef RTINODE     ino_t;
+#endif
+#if !defined(_OFF_T_DEFINED)
 typedef RTFOFF      off_t;
+#endif
+#if !defined(_PID_T_DEFINED)
 typedef RTPROCESS   pid_t;
+#endif
 #endif /* !IPRT_INCLUDED_nocrt_sys_types_h */

-              r96013
+              r96017
 #include <iprt/nocrt/sys/types.h>
+#if defined(RT_OS_WINDOWS) && defined(_USE_32BIT_TIME_T) && ARCH_BITS == 32
+#if !defined(_TIME_T_DEFINED)
+# if defined(RT_OS_WINDOWS) && defined(_USE_32BIT_TIME_T) && ARCH_BITS == 32
 typedef long time_t;
 #else
+# else
 typedef int64_t time_t;
 #endif
 #ifdef _MSC_VER
+# endif
+# ifdef _MSC_VER
 typedef int64_t __time64_t;
+#endif
+# endif
+#endif /* !_TIME_T_DEFINED */
+#if !defined(_INC_TIME)
 struct timespec
+{
 …
     const char *tm_zone;
 };
+#endif /* !_INC_TIME */
 RT_C_DECLS_BEGIN

Note: See TracChangeset for help on using the changeset viewer.