diff options
| author | Bernard Xiong <[email protected]> | 2021-10-13 15:41:36 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-10-13 15:41:36 +0800 |
| commit | 0873b8163bf425fdbbf0f528c54382c7923f54f1 (patch) | |
| tree | 11e9500d42d7e198396831481cb8a8f3e4e7a9cb | |
| parent | 0c82690f3208ce0182af2c4e47519c5892386497 (diff) | |
| parent | 9f2616e32313bd3c642ed46e72707f80f8272de3 (diff) | |
Merge pull request #5162 from xiangxistu/cxx_pthread
[modify] those file name is risky if you use both "c++" and "POSIX pthread".
| -rw-r--r-- | components/cplusplus/cxx_Mutex.cpp | 2 | ||||
| -rw-r--r-- | components/cplusplus/cxx_Semaphore.cpp | 2 | ||||
| -rw-r--r-- | components/cplusplus/cxx_Thread.cpp | 2 | ||||
| -rw-r--r-- | components/cplusplus/cxx_crt.cpp | 2 | ||||
| -rw-r--r-- | components/cplusplus/cxx_crt.h (renamed from components/cplusplus/crt.h) | 0 | ||||
| -rw-r--r-- | components/cplusplus/cxx_crt_init.c (renamed from components/cplusplus/crt_init.c) | 0 | ||||
| -rw-r--r-- | components/cplusplus/cxx_lock.h (renamed from components/cplusplus/Lock.h) | 0 | ||||
| -rw-r--r-- | components/cplusplus/cxx_mail.h (renamed from components/cplusplus/Mail.h) | 0 | ||||
| -rw-r--r-- | components/cplusplus/cxx_mutex.h (renamed from components/cplusplus/Mutex.h) | 0 | ||||
| -rw-r--r-- | components/cplusplus/cxx_queue.h (renamed from components/cplusplus/Queue.h) | 0 | ||||
| -rw-r--r-- | components/cplusplus/cxx_semaphore.h (renamed from components/cplusplus/Semaphore.h) | 0 | ||||
| -rw-r--r-- | components/cplusplus/cxx_thread.h (renamed from components/cplusplus/Thread.h) | 0 |
12 files changed, 4 insertions, 4 deletions
diff --git a/components/cplusplus/cxx_Mutex.cpp b/components/cplusplus/cxx_Mutex.cpp index ad20e805e9..97d8fa87e1 100644 --- a/components/cplusplus/cxx_Mutex.cpp +++ b/components/cplusplus/cxx_Mutex.cpp @@ -7,7 +7,7 @@ * Date Author Notes */ -#include "Mutex.h" +#include "cxx_mutex.h" using namespace rtthread; diff --git a/components/cplusplus/cxx_Semaphore.cpp b/components/cplusplus/cxx_Semaphore.cpp index eda71f24a3..672eeb04af 100644 --- a/components/cplusplus/cxx_Semaphore.cpp +++ b/components/cplusplus/cxx_Semaphore.cpp @@ -7,7 +7,7 @@ * Date Author Notes */ -#include "Semaphore.h" +#include "cxx_semaphore.h" using namespace rtthread; diff --git a/components/cplusplus/cxx_Thread.cpp b/components/cplusplus/cxx_Thread.cpp index 9689f6691b..f3484bb1f4 100644 --- a/components/cplusplus/cxx_Thread.cpp +++ b/components/cplusplus/cxx_Thread.cpp @@ -7,7 +7,7 @@ * Date Author Notes */ -#include "Thread.h" +#include "cxx_thread.h" using namespace rtthread; diff --git a/components/cplusplus/cxx_crt.cpp b/components/cplusplus/cxx_crt.cpp index 750e01e0cb..de2fe3cd74 100644 --- a/components/cplusplus/cxx_crt.cpp +++ b/components/cplusplus/cxx_crt.cpp @@ -9,7 +9,7 @@ */ #include <rtthread.h> -#include "crt.h" +#include "cxx_crt.h" void *operator new(size_t size) { diff --git a/components/cplusplus/crt.h b/components/cplusplus/cxx_crt.h index 903d4c86cd..903d4c86cd 100644 --- a/components/cplusplus/crt.h +++ b/components/cplusplus/cxx_crt.h diff --git a/components/cplusplus/crt_init.c b/components/cplusplus/cxx_crt_init.c index 977dee6ee9..977dee6ee9 100644 --- a/components/cplusplus/crt_init.c +++ b/components/cplusplus/cxx_crt_init.c diff --git a/components/cplusplus/Lock.h b/components/cplusplus/cxx_lock.h index c3cc1d2dae..c3cc1d2dae 100644 --- a/components/cplusplus/Lock.h +++ b/components/cplusplus/cxx_lock.h diff --git a/components/cplusplus/Mail.h b/components/cplusplus/cxx_mail.h index ae3bfb5c41..ae3bfb5c41 100644 --- a/components/cplusplus/Mail.h +++ b/components/cplusplus/cxx_mail.h diff --git a/components/cplusplus/Mutex.h b/components/cplusplus/cxx_mutex.h index 63efb4a6ea..63efb4a6ea 100644 --- a/components/cplusplus/Mutex.h +++ b/components/cplusplus/cxx_mutex.h diff --git a/components/cplusplus/Queue.h b/components/cplusplus/cxx_queue.h index f6b91e1a21..f6b91e1a21 100644 --- a/components/cplusplus/Queue.h +++ b/components/cplusplus/cxx_queue.h diff --git a/components/cplusplus/Semaphore.h b/components/cplusplus/cxx_semaphore.h index 45c916e169..45c916e169 100644 --- a/components/cplusplus/Semaphore.h +++ b/components/cplusplus/cxx_semaphore.h diff --git a/components/cplusplus/Thread.h b/components/cplusplus/cxx_thread.h index 0e681e5c2a..0e681e5c2a 100644 --- a/components/cplusplus/Thread.h +++ b/components/cplusplus/cxx_thread.h |