From 8cf3a1e7d97b185cae4ad76f10f5e77a874e150f Mon Sep 17 00:00:00 2001
From: nnhy <nnhy@vip.qq.com>
Date: Mon, 14 Mar 2016 03:51:32 +0000
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=A4=B4=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E8=83=BD=E5=8F=ABString.h=EF=BC=8C=E5=90=A6?=
 =?UTF-8?q?=E5=88=99=E8=B7=9Fgcc=E5=86=85=E9=83=A8=E7=9A=84string.h?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=EF=BC=8C=E5=80=92=E7=BD=AE=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 String.h => SString.h | 0
 String.cpp            | 2 +-
 Sys.h                 | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename String.h => SString.h (100%)

diff --git a/String.h b/SString.h
similarity index 100%
rename from String.h
rename to SString.h
diff --git a/String.cpp b/String.cpp
index 3b97d722..c4ad16fc 100644
--- a/String.cpp
+++ b/String.cpp
@@ -5,7 +5,7 @@
 #include <math.h>
 #include <stdarg.h>
 
-#include "String.h"
+#include "SString.h"
 
 char* utohex(uint value, byte size, char* string, bool upper);
 extern char* itoa(int value, char* string, int radix);
diff --git a/Sys.h b/Sys.h
index 870cde8c..4d12b164 100644
--- a/Sys.h
+++ b/Sys.h
@@ -41,7 +41,7 @@ void assert_failed2(const char* msg, const char* file, unsigned int line);
 #endif
 
 #include "Type.h"
-#include "String.h"
+#include "SString.h"
 
 /* 引脚定义 */
 #include "Platform\Pin.h"