win32/msvc: workaround for windows

Signed-off-by: chao an <[email protected]>
anchao · Jul 13, 2023 · aa8501c · aa8501c
1 parent ea5a608
commit aa8501c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/drivers/net/netdev_upperhalf.c b/drivers/net/netdev_upperhalf.c
@@ -554,6 +554,7 @@ int netdev_upper_wireless_ioctl(FAR struct netdev_lowerhalf_s *lower,
   FAR const struct wireless_ops_s *ops = lower->iw_ops;
   const struct ether_addr zero =
     {
+      0
     };
 
   /* Decode and dispatch the driver-specific IOCTL command */

diff --git a/mm/mempool/mempool_multiple.c b/mm/mempool/mempool_multiple.c
@@ -193,7 +193,7 @@ mempool_multiple_alloc_chunk(FAR struct mempool_multiple_s *mpool,
     }
 
   ret = (FAR void *)ALIGN_UP(chunk->next, align);
-  if (chunk->end - (FAR char *)ret < size)
+  if ((uintptr_t)chunk->end - (uintptr_t)ret < size)
     {
       goto retry;
     }
@@ -738,7 +738,7 @@ mempool_multiple_mallinfo(FAR struct mempool_multiple_s *mpool)
       FAR struct mpool_chunk_s *chunk;
 
       chunk = (FAR struct mpool_chunk_s *)sq_peek(&mpool->chunk_queue);
-      info.fordblks += chunk->end - chunk->next;
+      info.fordblks += (uintptr_t)chunk->end - (uintptr_t)chunk->next;
     }
 
   nxmutex_unlock(&mpool->lock);

diff --git a/net/local/local_fifo.c b/net/local/local_fifo.c
@@ -49,8 +49,12 @@
 #define LOCAL_HD_SUFFIX    "HD"  /* Name of the half duplex datagram FIFO */
 #define LOCAL_SUFFIX_LEN   2
 
+#ifndef _MSC_VER
 #define LOCAL_FULLPATH_LEN (strlen(CONFIG_NET_LOCAL_VFS_PATH) + \
                             UNIX_PATH_MAX + LOCAL_SUFFIX_LEN + 2)
+#else
+#define LOCAL_FULLPATH_LEN (UNIX_PATH_MAX + LOCAL_SUFFIX_LEN + 2)
+#endif
 
 /****************************************************************************
  * Private Functions

diff --git a/sched/misc/assert.c b/sched/misc/assert.c
@@ -332,6 +332,7 @@ static void dump_task(FAR struct tcb_s *tcb, FAR void *arg)
 
   /* Dump interesting properties of this task */
 
+#ifndef _MSC_VER
   _alert("   %4d %5d"
 #ifdef CONFIG_SMP
          "  %4d"
@@ -380,6 +381,7 @@ static void dump_task(FAR struct tcb_s *tcb, FAR void *arg)
 #endif
          , args
         );
+#endif
 }
 
 /****************************************************************************
@@ -414,6 +416,7 @@ static void dump_tasks(void)
 
   /* Dump interesting properties of each task in the crash environment */
 
+#ifndef _MSC_VER
   _alert("   PID GROUP"
 #ifdef CONFIG_SMP
          "   CPU"
@@ -457,6 +460,7 @@ static void dump_tasks(void)
          (stack_filled >= 10 * 80 ? '!' : ' ')
 #  endif
         );
+#endif
 #endif
 
   nxsched_foreach(dump_task, NULL);
@@ -580,6 +584,7 @@ void _assert(FAR const char *filename, int linenum,
          name.sysname, name.nodename,
          name.release, name.version, name.machine);
 
+#ifndef _MSC_VER
   _alert("Assertion failed %s: at file: %s:%d task"
 #ifdef CONFIG_SMP
          "(CPU%d)"
@@ -598,6 +603,7 @@ void _assert(FAR const char *filename, int linenum,
          rtcb->name,
 #endif
          rtcb->entry.main);
+#endif
 
   /* Show back trace */