Commit 494a7894 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard

msvcrt: Use _Dcomplex definition from public header.

parent 200fe8ac
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
* ==================================================== * ====================================================
*/ */
#include <complex.h>
#include <stdio.h> #include <stdio.h>
#include <fenv.h> #include <fenv.h>
#include <fpieee.h> #include <fpieee.h>
...@@ -4177,14 +4178,14 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, ...@@ -4177,14 +4178,14 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res,
_Dcomplex* CDECL _Cbuild(_Dcomplex *ret, double r, double i) _Dcomplex* CDECL _Cbuild(_Dcomplex *ret, double r, double i)
{ {
ret->x = r; ret->_Val[0] = r;
ret->y = i; ret->_Val[1] = i;
return ret; return ret;
} }
double CDECL MSVCR120_creal(_Dcomplex z) double CDECL MSVCR120_creal(_Dcomplex z)
{ {
return z.x; return z._Val[0];
} }
/********************************************************************* /*********************************************************************
......
...@@ -283,8 +283,6 @@ extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; ...@@ -283,8 +283,6 @@ extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN;
extern FILE MSVCRT__iob[]; extern FILE MSVCRT__iob[];
typedef struct _complex _Dcomplex;
#ifdef __i386__ #ifdef __i386__
struct MSVCRT___JUMP_BUFFER { struct MSVCRT___JUMP_BUFFER {
unsigned long Ebp; unsigned long Ebp;
......
...@@ -443,6 +443,7 @@ SOURCES = \ ...@@ -443,6 +443,7 @@ SOURCES = \
mstask.idl \ mstask.idl \
mstcpip.h \ mstcpip.h \
msvcrt/assert.h \ msvcrt/assert.h \
msvcrt/complex.h \
msvcrt/conio.h \ msvcrt/conio.h \
msvcrt/corecrt.h \ msvcrt/corecrt.h \
msvcrt/corecrt_startup.h \ msvcrt/corecrt_startup.h \
......
/**
* This file has no copyright assigned and is placed in the Public Domain.
* This file is part of the Wine project.
*/
#ifndef _COMPLEX_H_DEFINED
#define _COMPLEX_H_DEFINED
#include <corecrt.h>
#ifndef _C_COMPLEX_T
#define _C_COMPLEX_T
typedef struct _C_double_complex
{
double _Val[2];
} _C_double_complex;
typedef struct _C_float_complex
{
float _Val[2];
} _C_float_complex;
#endif
typedef _C_double_complex _Dcomplex;
typedef _C_float_complex _Fcomplex;
#endif /* _COMPLEX_H_DEFINED */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment