【探索发现STM32 F3系列】在移植uCOS-II+uCGUI时出现的错误，求解决！

xiaoyu-398191

在移植uCOS-II+uCGUI时出现的错误，求解决。 
compiling App.c...
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h(23): error:  #256: invalid redeclaration of type name "s32" (declared at line 487 of "..\Libraries\CM3\stm32f10x.h")
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:   typedef signed long  s32;
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:                        ^
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h(27): error:  #256: invalid redeclaration of type name "sc32" (declared at line 491 of "..\Libraries\CM3\stm32f10x.h")
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:   typedef signed long  const sc32;  /* Read Only */
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:                              ^
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h(31): error:  #256: invalid redeclaration of type name "vs32" (declared at line 495 of "..\Libraries\CM3\stm32f10x.h")
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:   typedef volatile signed long  vs32;
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:                                 ^
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h(35): error:  #256: invalid redeclaration of type name "vsc32" (declared at line 499 of "..\Libraries\CM3\stm32f10x.h")
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:   typedef volatile signed long  const vsc32;  /* Read Only */
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:                                       ^
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h(39): error:  #256: invalid redeclaration of type name "u32" (declared at line 503 of "..\Libraries\CM3\stm32f10x.h")
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:   typedef unsigned long  u32;
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:                          ^
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h(43): error:  #256: invalid redeclaration of type name "uc32" (declared at line 507 of "..\Libraries\CM3\stm32f10x.h")
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:   typedef unsigned long  const uc32;  /* Read Only */
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:                                ^
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h(47): error:  #256: invalid redeclaration of type name "vu32" (declared at line 511 of "..\Libraries\CM3\stm32f10x.h")
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:   typedef volatile unsigned long  vu32;
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:                                   ^
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h(51): error:  #256: invalid redeclaration of type name "vuc32" (declared at line 515 of "..\Libraries\CM3\stm32f10x.h")
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:   typedef volatile unsigned long  const vuc32;  /* Read Only */
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:                                         ^
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h(57): error:  #101: "RESET" has already been declared in the current scope
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:   typedef enum {RESET = 0, SET = !RESET} FlagStatus, ITStatus;
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:                 ^
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h(57): error:  #101: "SET" has already been declared in the current scope
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:   typedef enum {RESET = 0, SET = !RESET} FlagStatus, ITStatus;
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:                            ^
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h(57): error:  #256: invalid redeclaration of type name "FlagStatus" (declared at line 519 of "..\Libraries\CM3\stm32f10x.h")
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:   typedef enum {RESET = 0, SET = !RESET} FlagStatus, ITStatus;
C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h:        
 
 
出现这么多错误，我知道是新的st库跟keil安装的老版本的库之间的冲突，新的st库是用3.50的
求大侠搭救                              ^

代码小呆瓜

stm32f10x_type.h 中有很多的变量在stm32f10x.h中已经声明了，只要把stm32f10x_type.h声明处屏蔽就行了