[PATCH v3] include: Add some math declarations.

Alexandre Julliard julliard at winehq.org
Fri Apr 8 12:10:45 CDT 2022


Daniel Lehman <dlehman25 at gmail.com> writes:

> Signed-off-by: Daniel Lehman <dlehman25 at gmail.com>
>
> ---
> v3: remove incorrect declarations and other unavailable functions
> v2: correct some declarations
> ---
>  include/msvcrt/math.h | 32 +++++++++++++++++++++++++++++---
>  1 file changed, 29 insertions(+), 3 deletions(-)

It doesn't match the function definitions:

gcc -m64 -c -o dlls/msvcr120/math.o ../wine/dlls/msvcrt/math.c -Idlls/msvcr120 -I../wine/dlls/msvcr120 \
  -I../wine/dlls/msvcrt -Iinclude -I../wine/include -I../wine/include/msvcrt -D__WINESRC__ \
  -D_CRTIMP= -D_MSVCR_VER=120 -Wall -pipe -fcf-protection=none -fno-stack-protector \
  -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Winit-self \
  -Wno-packed-not-aligned -Wshift-overflow=2 -Wstrict-prototypes -Wtype-limits \
  -Wunused-but-set-parameter -Wvla -Wwrite-strings -Wpointer-arith -Wlogical-op -gdwarf-4 -fPIC \
  -fasynchronous-unwind-tables -D_WIN32 -fno-builtin -fshort-wchar -Wno-format -mabi=ms -g -O2 -fno-diagnostics-show-caret
../wine/dlls/msvcrt/math.c:8698:15: error: conflicting types for ‘llrint’; have ‘long int(double)’
In file included from ../wine/dlls/msvcrt/math.c:45:
../wine/include/msvcrt/math.h:114:28: note: previous declaration of ‘llrint’ with type ‘long long int(double)’
../wine/dlls/msvcrt/math.c:8714:15: error: conflicting types for ‘llrintf’; have ‘long int(float)’
In file included from ../wine/dlls/msvcrt/math.c:45:
../wine/include/msvcrt/math.h:115:28: note: previous declaration of ‘llrintf’ with type ‘long long int(float)’
../wine/dlls/msvcrt/math.c:8801:15: error: conflicting types for ‘llround’; have ‘long int(double)’
In file included from ../wine/dlls/msvcrt/math.c:45:
../wine/include/msvcrt/math.h:116:28: note: previous declaration of ‘llround’ with type ‘long long int(double)’
../wine/dlls/msvcrt/math.c:8816:15: error: conflicting types for ‘llroundf’; have ‘long int(float)’
In file included from ../wine/dlls/msvcrt/math.c:45:
../wine/include/msvcrt/math.h:117:28: note: previous declaration of ‘llroundf’ with type ‘long long int(float)’
make: *** [Makefile:104865: dlls/msvcr120/math.o] Error 1

-- 
Alexandre Julliard
julliard at winehq.org



More information about the wine-devel mailing list