diff options
| author |  bunnei | 2014-11-02 18:57:30 -0500 |
|---|---|---|
| committer | bunnei | 2014-11-02 18:57:30 -0500 |
| commit | 5a1de3366ccd89ac1d557ab8aff1398a0a0f8827 (patch) | |
| tree | e0d5679a4ccb259f88c8d878222f7f06036e081e | |
| parent | Merge pull request #163 from archshift/create-directory (diff) | |
| parent | Fix compilation errors (diff) | |
| download | yuzu-5a1de3366ccd89ac1d557ab8aff1398a0a0f8827.tar.gz yuzu-5a1de3366ccd89ac1d557ab8aff1398a0a0f8827.tar.xz yuzu-5a1de3366ccd89ac1d557ab8aff1398a0a0f8827.zip | |
Merge pull request #182 from SeannyM/fix-compile
Fix compilation errors
Diffstat (limited to '')
| -rw-r--r-- | src/core/arm/skyeye_common/vfp/vfp_helper.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/skyeye_common/vfp/vfp_helper.h b/src/core/arm/skyeye_common/vfp/vfp_helper.h index f0896fc87..b1949603a 100644 --- a/src/core/arm/skyeye_common/vfp/vfp_helper.h +++ b/src/core/arm/skyeye_common/vfp/vfp_helper.h | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | #define pr_info //printf | 44 | #define pr_info //printf |
| 45 | #define pr_debug //printf | 45 | #define pr_debug //printf |
| 46 | 46 | ||
| 47 | static u32 fls(int x); | 47 | static u32 fls(ARMword x); |
| 48 | #define do_div(n, base) {n/=base;} | 48 | #define do_div(n, base) {n/=base;} |
| 49 | 49 | ||
| 50 | /* From vfpinstr.h */ | 50 | /* From vfpinstr.h */ |
| @@ -502,7 +502,7 @@ struct op { | |||
| 502 | u32 flags; | 502 | u32 flags; |
| 503 | }; | 503 | }; |
| 504 | 504 | ||
| 505 | static u32 fls(int x) | 505 | static u32 fls(ARMword x) |
| 506 | { | 506 | { |
| 507 | int r = 32; | 507 | int r = 32; |
| 508 | 508 | ||