From 9f2616e32313bd3c642ed46e72707f80f8272de3 Mon Sep 17 00:00:00 2001 From: liuxianliang Date: Wed, 13 Oct 2021 15:20:29 +0800 Subject: [PATCH] [modify] those file name is risky if you use both "c++" and "POSIX pthread". --- components/cplusplus/cxx_Mutex.cpp | 2 +- components/cplusplus/cxx_Semaphore.cpp | 2 +- components/cplusplus/cxx_Thread.cpp | 2 +- components/cplusplus/cxx_crt.cpp | 2 +- components/cplusplus/{crt.h => cxx_crt.h} | 0 components/cplusplus/{crt_init.c => cxx_crt_init.c} | 0 components/cplusplus/{Lock.h => cxx_lock.h} | 0 components/cplusplus/{Mail.h => cxx_mail.h} | 0 components/cplusplus/{Mutex.h => cxx_mutex.h} | 0 components/cplusplus/{Queue.h => cxx_queue.h} | 0 components/cplusplus/{Semaphore.h => cxx_semaphore.h} | 0 components/cplusplus/{Thread.h => cxx_thread.h} | 0 12 files changed, 4 insertions(+), 4 deletions(-) rename components/cplusplus/{crt.h => cxx_crt.h} (100%) rename components/cplusplus/{crt_init.c => cxx_crt_init.c} (100%) rename components/cplusplus/{Lock.h => cxx_lock.h} (100%) rename components/cplusplus/{Mail.h => cxx_mail.h} (100%) rename components/cplusplus/{Mutex.h => cxx_mutex.h} (100%) rename components/cplusplus/{Queue.h => cxx_queue.h} (100%) rename components/cplusplus/{Semaphore.h => cxx_semaphore.h} (100%) rename components/cplusplus/{Thread.h => cxx_thread.h} (100%) diff --git a/components/cplusplus/cxx_Mutex.cpp b/components/cplusplus/cxx_Mutex.cpp index ad20e805e..97d8fa87e 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 eda71f24a..672eeb04a 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 9689f6691..f3484bb1f 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 750e01e0c..de2fe3cd7 100644 --- a/components/cplusplus/cxx_crt.cpp +++ b/components/cplusplus/cxx_crt.cpp @@ -9,7 +9,7 @@ */ #include -#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 similarity index 100% rename from components/cplusplus/crt.h rename to components/cplusplus/cxx_crt.h diff --git a/components/cplusplus/crt_init.c b/components/cplusplus/cxx_crt_init.c similarity index 100% rename from components/cplusplus/crt_init.c rename to components/cplusplus/cxx_crt_init.c diff --git a/components/cplusplus/Lock.h b/components/cplusplus/cxx_lock.h similarity index 100% rename from components/cplusplus/Lock.h rename to components/cplusplus/cxx_lock.h diff --git a/components/cplusplus/Mail.h b/components/cplusplus/cxx_mail.h similarity index 100% rename from components/cplusplus/Mail.h rename to components/cplusplus/cxx_mail.h diff --git a/components/cplusplus/Mutex.h b/components/cplusplus/cxx_mutex.h similarity index 100% rename from components/cplusplus/Mutex.h rename to components/cplusplus/cxx_mutex.h diff --git a/components/cplusplus/Queue.h b/components/cplusplus/cxx_queue.h similarity index 100% rename from components/cplusplus/Queue.h rename to components/cplusplus/cxx_queue.h diff --git a/components/cplusplus/Semaphore.h b/components/cplusplus/cxx_semaphore.h similarity index 100% rename from components/cplusplus/Semaphore.h rename to components/cplusplus/cxx_semaphore.h diff --git a/components/cplusplus/Thread.h b/components/cplusplus/cxx_thread.h similarity index 100% rename from components/cplusplus/Thread.h rename to components/cplusplus/cxx_thread.h -- GitLab