From 54f23a42939a2775385e18acb0eea7aa6e37c511 Mon Sep 17 00:00:00 2001 From: SASANO Takayoshi Date: Wed, 3 Oct 2018 21:03:00 +0900 Subject: [PATCH] avoid to conflicting types for 'uint32_t' error. already uint32_t is defined at components/libc/compilers/minilibc/stdint.h. there is two ways to solve, using /uint32_t pair or /rt_uint32_t pair. I choose former because this code belongs to C compiler, not RT-Thread system. --- libcpu/ia32/__udivsi3.c | 5 +---- libcpu/ia32/__umodsi3.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libcpu/ia32/__udivsi3.c b/libcpu/ia32/__udivsi3.c index a62228a009..ec7c59d1cb 100644 --- a/libcpu/ia32/__udivsi3.c +++ b/libcpu/ia32/__udivsi3.c @@ -12,10 +12,7 @@ * 2006-10-09 Bernard the first version for i386 */ -#include - -typedef rt_uint32_t uint32_t; -typedef rt_int32_t int32_t; +#include uint32_t __udivsi3(uint32_t num, uint32_t den) { diff --git a/libcpu/ia32/__umodsi3.c b/libcpu/ia32/__umodsi3.c index fde56f97cd..226a2c0800 100644 --- a/libcpu/ia32/__umodsi3.c +++ b/libcpu/ia32/__umodsi3.c @@ -12,10 +12,7 @@ * 2006-10-09 Bernard the first version for i386 */ -#include - -typedef rt_uint32_t uint32_t; -typedef rt_int32_t int32_t; +#include uint32_t __umodsi3(uint32_t num, uint32_t den) {