Changeset 96019 in vbox

Timestamp:

Aug 4, 2022 8:37:27 AM (3 years ago)

Author:

vboxsync

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

152814

Message:

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

Location:

trunk/include/iprt/nocrt

Files:

• math.h (modified) (2 diffs)
• sys/types.h (modified) (1 diff)
• time.h (modified) (4 diffs)

trunk/include/iprt/nocrt/math.h

@@ -526 +526 @@
 #define isinf(x)                    \
     ((sizeof (x) == sizeof (float)) ? RT_NOCRT(__isinff)(x)   \
-    : (sizeof (x) == sizeof (double)) ? isinf(x)    \
+    : (sizeof (x) == sizeof (double)) ? RT_NOCRT(isinf)(x)    \
     : RT_NOCRT(__isinfl)(x))
 #define isnan(x)                    \
-    ((sizeof (x) == sizeof (float)) ? isnanf(x)     \
-    : (sizeof (x) == sizeof (double)) ? isnan(x)    \
+    ((sizeof (x) == sizeof (float)) ? RT_NOCRT(isnanf)(x)     \
+    : (sizeof (x) == sizeof (double)) ? RT_NOCRT(isnan)(x)    \
     : RT_NOCRT(__isnanl)(x))
 #define isnormal(x)                 \
@@ -663 +663 @@
 # define drem RT_NOCRT(drem)
 # define finite RT_NOCRT(finite)
-# define isinf RT_NOCRT(isinf)
-# define isnan RT_NOCRT(isnan)
+/*# define isinf RT_NOCRT(isinf) - already a macro */
+/*# define isnan RT_NOCRT(isnan) - already a macro */
 # define isnanf RT_NOCRT(isnanf)
 # define gamma_r RT_NOCRT(gamma_r)

trunk/include/iprt/nocrt/sys/types.h

@@ -32 +32 @@
 #include <iprt/types.h>
 
-#if !defined(_DEV_T_DEFINED)
+/* #if !defined(MSC-define) && !defined(GNU/LINUX-define) */
+#if !defined(_DEV_T_DEFINED) && !defined(__dev_t_defined)
 typedef RTDEV       dev_t;
 #endif
-#if !defined(_UCRT_RESTORE_CLANG_WARNINGS)
+#if !defined(_UCRT_RESTORE_CLANG_WARNINGS) /* MSC specific type */
 typedef int         errno_t;
 #endif
-#if !defined(_INO_T_DEFINED)
+#if !defined(_INO_T_DEFINED) && !defined(__ino_t_defined)
 typedef RTINODE     ino_t;
 #endif
-#if !defined(_OFF_T_DEFINED)
+#if !defined(_OFF_T_DEFINED) && !defined(__off_t_defined)
 typedef RTFOFF      off_t;
 #endif
-#if !defined(_PID_T_DEFINED)
+#if !defined(_PID_T_DEFINED) && !defined(__pid_t_defined)
 typedef RTPROCESS   pid_t;
 #endif

trunk/include/iprt/nocrt/time.h

@@ -35 +35 @@
 #include <iprt/nocrt/sys/types.h>
 
-#if !defined(_TIME_T_DEFINED)
+/* #if !defined(MSC-define) && !defined(GNU/LINUX-define) */
+#if !defined(_TIME_T_DEFINED) && !defined(__time_t_defined)
 # if defined(RT_OS_WINDOWS) && defined(_USE_32BIT_TIME_T) && ARCH_BITS == 32
 typedef long time_t;
@@ -46 +47 @@
 #endif /* !_TIME_T_DEFINED */
 
-#if !defined(_INC_TIME)
+#if !defined(_INC_TIME) /* MSC/UCRT guard */
+
+# if !defined(_STRUCT_TIMESPEC)
 struct timespec
 {
@@ -52 +55 @@
     long   tv_nsec;
 };
+# endif
 
+#if !defined(__struct_tm_defined)
 struct tm
 {
@@ -59 +64 @@
     const char *tm_zone;
 };
+# endif
 
 #endif /* !_INC_TIME */