mirror of
https://gitee.com/xiaohuolufeihua/bizhang_-obav.git
synced 2026-05-22 01:12:31 +00:00
a5fa4e9c02
* Order patch application Per discussion with @demarchi this PR adds ordering to the patch application. This alos add some encoding 00000 series - is for px4 non up streamable changes 60000 (bp) series - is for back ports 90000 series - is for wip that shold make it upstream * Restore 00010-workarround-for-flash-data-cache-corruption Extract this from the 90000-wip-inflight-to-upstream.patch and orders it. * Moved upstreamed 0dbf44e flash fix to bp patch * Moved upstreamed 5481087 cdcacm fix to bp patch * Moved upstreamed ec85425 STM32F7 copy paste errors to bp patch * Moved upstreamed 20e7237 HSI should not be turned off to bp patch * Moved upstreamed ca895b9 Adding missing CONFIG_ prefix to bp patch * Moved upstreamed 169b398 STM32: Fixes the bkp reference counter issue to bp patch * Moved upstreamed 550d259 STM32F7: Fixes the bkp reference counter issue to bp patch * Moved upstreamed 02825f3 STM32F3X: Add missing STM32_BKP_BASE to bp patch * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Order Patches by Name
63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
diff --git NuttX/nuttx/include/signal.h NuttX/nuttx/include/signal.h
|
|
index bd8ee9f..7ee242a 100644
|
|
--- NuttX/nuttx/include/signal.h
|
|
+++ NuttX/nuttx/include/signal.h
|
|
@@ -282,8 +282,11 @@ extern "C"
|
|
|
|
int kill(pid_t pid, int signo);
|
|
int raise(int signo);
|
|
+#pragma GCC diagnostic push
|
|
+#pragma GCC diagnostic ignored "-Wshadow"
|
|
int sigaction(int signo, FAR const struct sigaction *act,
|
|
FAR struct sigaction *oact);
|
|
+#pragma GCC diagnostic pop
|
|
int sigaddset(FAR sigset_t *set, int signo);
|
|
int sigdelset(FAR sigset_t *set, int signo);
|
|
int sigemptyset(FAR sigset_t *set);
|
|
diff --git NuttX/nuttx/include/stdlib.h NuttX/nuttx/include/stdlib.h
|
|
index aa259c9..f2b0640 100644
|
|
--- NuttX/nuttx/include/stdlib.h
|
|
+++ NuttX/nuttx/include/stdlib.h
|
|
@@ -202,7 +202,10 @@ FAR void *zalloc(size_t);
|
|
FAR void *calloc(size_t, size_t);
|
|
|
|
#ifdef CONFIG_CAN_PASS_STRUCTS
|
|
+#pragma GCC diagnostic push
|
|
+#pragma GCC diagnostic ignored "-Wshadow"
|
|
struct mallinfo mallinfo(void);
|
|
+#pragma GCC diagnostic pop
|
|
#else
|
|
int mallinfo(FAR struct mallinfo *info);
|
|
#endif
|
|
diff --git NuttX/nuttx/include/sys/stat.h NuttX/nuttx/include/sys/stat.h
|
|
index 3f2658b..41c8604 100644
|
|
--- NuttX/nuttx/include/sys/stat.h
|
|
+++ NuttX/nuttx/include/sys/stat.h
|
|
@@ -131,7 +131,10 @@ extern "C"
|
|
|
|
int mkdir(FAR const char *pathname, mode_t mode);
|
|
int mkfifo(FAR const char *pathname, mode_t mode);
|
|
+#pragma GCC diagnostic push
|
|
+#pragma GCC diagnostic ignored "-Wshadow"
|
|
int stat(const char *path, FAR struct stat *buf);
|
|
+#pragma GCC diagnostic pop
|
|
#if 0 /* Not yet supported */
|
|
int fstat(int fd, FAR struct stat *buf);
|
|
#endif
|
|
diff --git NuttX/nuttx/include/sys/statfs.h NuttX/nuttx/include/sys/statfs.h
|
|
index 1d1786a..12f802b 100644
|
|
--- NuttX/nuttx/include/sys/statfs.h
|
|
+++ NuttX/nuttx/include/sys/statfs.h
|
|
@@ -139,8 +139,11 @@ extern "C"
|
|
* form of the struct statfs.
|
|
*/
|
|
|
|
+#pragma GCC diagnostic push
|
|
+#pragma GCC diagnostic ignored "-Wshadow"
|
|
int statfs(FAR const char *path, FAR struct statfs *buf);
|
|
int fstatfs(int fd, FAR struct statfs *buf);
|
|
+#pragma GCC diagnostic pop
|
|
|
|
#undef EXTERN
|
|
#if defined(__cplusplus)
|