关于寄存器和库函数程序移植问题

crystal416

 我想把之前的用寄存器写的程序移植到库函数写的新程序里边，但是添加进去之后编译没问题，但是在main函数里边include一下头文件，就报了很多错误，如下：
好像是一个是程序自己加入的库函数，还有一个是keil自带的库函数，我该怎么把这两个统一起来呢？或者只用一个库函数，屏蔽掉另一个
？有没有什么解决办法呢？急求。。。

C:\Keil\ARM\INC\ST\STM32F10x\stm32f10x_type.h(23): error:  #256: invalid redeclaration of type name "s32" (declared at line 487 of "..\inc\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 "..\inc\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 "..\inc\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 "..\inc\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 "..\inc\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 "..\inc\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 "..\inc\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 "..\inc\stm32f10x.h")

正点原子

重复定义了，去掉stm32f10x.h或者stm32f10x_lib.h的其中一个。