Alexandre Julliard : include/msvcrt: Remove some prototypes that conflict with gcc builtins.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f402bcd0c310b15e547cf426f88a017e6600fecb
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=f402bcd0c310b15e547cf426f...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Apr 22 12:46:58 2019 +0200

include/msvcrt: Remove some prototypes that conflict with gcc builtins.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 include/msvcrt/math.h    | 1 -
 include/msvcrt/process.h | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h
index f8b2add..c22c053 100644
--- a/include/msvcrt/math.h
+++ b/include/msvcrt/math.h
@@ -221,7 +221,6 @@ static inline double jn( int n, double x ) { return _jn( n, x ); }
 static inline double y0( double x ) { return _y0( x ); }
 static inline double y1( double x ) { return _y1( x ); }
 static inline double yn( int n, double x ) { return _yn( n, x ); }
-static inline double cabs( struct _complex z ) { return _cabs( z ); }
 
 static inline float hypotf( float x, float y ) { return _hypotf( x, y ); }
 
diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h
index 94017c6..3cae112 100644
--- a/include/msvcrt/process.h
+++ b/include/msvcrt/process.h
@@ -94,14 +94,14 @@ int      __cdecl _wsystem(const wchar_t*);
 
 static inline intptr_t cwait(int *status, intptr_t pid, int action) { return _cwait(status, pid, action); }
 static inline int getpid(void) { return _getpid(); }
-static inline intptr_t execv(const char* name, const char* const* argv) { return _execv(name, argv); }
-static inline intptr_t execve(const char* name, const char* const* argv, const char* const* envv) { return _execve(name, argv, envv); }
-static inline intptr_t execvp(const char* name, const char* const* argv) { return _execvp(name, argv); }
-static inline intptr_t execvpe(const char* name, const char* const* argv, const char* const* envv) { return _execvpe(name, argv, envv); }
 static inline intptr_t spawnv(int flags, const char* name, const char* const* argv) { return _spawnv(flags, name, argv); }
 static inline intptr_t spawnve(int flags, const char* name, const char* const* argv, const char* const* envv) { return _spawnve(flags, name, argv, envv); }
 static inline intptr_t spawnvp(int flags, const char* name, const char* const* argv) { return _spawnvp(flags, name, argv); }
 static inline intptr_t spawnvpe(int flags, const char* name, const char* const* argv, const char* const* envv) { return _spawnvpe(flags, name, argv, envv); }
+#define execv   _execv
+#define execve  _execve
+#define execvp  _execvp
+#define execvpe _execvpe
 
 #if defined(__GNUC__) && (__GNUC__ < 4)
 extern intptr_t WINAPIV execl(const char*,const char*,...) __attribute__((alias("_execl")));