3 files changed, 20 insertions, 18 deletions
diff --git a/win32/include/math.h b/win32/include/math.h
index 984a717..4fe64e7 100644
--- a/win32/include/math.h
+++ b/win32/include/math.h
@@ -666,6 +666,7 @@ extern "C" {
   extern long double __cdecl fmal (long double, long double, long double);
 
 
+#if 0 // gr: duplicate, see below
   /* 7.12.14 */
   /* 
   *  With these functions, comparisons involving quiet NaNs set the FP
@@ -708,6 +709,7 @@ extern "C" {
   & 0x4500) == 0x4500)
 
 #endif
+#endif //0
 
 
 #endif /* __STDC_VERSION__ >= 199901L */
diff --git a/win32/include/process.h b/win32/include/process.h
index f679442..dadaf2b 100644
--- a/win32/include/process.h
+++ b/win32/include/process.h
@@ -153,20 +153,20 @@ extern "C" {
      stupid warnings, define them in POSIX way.  This is save, because those
      methods do not return in success case, so that the return value is not
      really dependent to its scalar width.  */
-  int __cdecl execv(const char *_Filename,char *const _ArgList[]);
-  int __cdecl execve(const char *_Filename,char *const _ArgList[],char *const _Env[]);
-  int __cdecl execvp(const char *_Filename,char *const _ArgList[]);
-  int __cdecl execvpe(const char *_Filename,char *const _ArgList[],char *const _Env[]);
+  int __cdecl execv(const char *_Filename,const char *const _ArgList[]);
+  int __cdecl execve(const char *_Filename,const char *const _ArgList[],const char *const _Env[]);
+  int __cdecl execvp(const char *_Filename,const char *const _ArgList[]);
+  int __cdecl execvpe(const char *_Filename,const char *const _ArgList[],const char *const _Env[]);
 #else
-  intptr_t __cdecl execv(const char *_Filename,char *const _ArgList[]);
-  intptr_t __cdecl execve(const char *_Filename,char *const _ArgList[],char *const _Env[]);
-  intptr_t __cdecl execvp(const char *_Filename,char *const _ArgList[]);
-  intptr_t __cdecl execvpe(const char *_Filename,char *const _ArgList[],char *const _Env[]);
+  intptr_t __cdecl execv(const char *_Filename,const char *const _ArgList[]);
+  intptr_t __cdecl execve(const char *_Filename,const char *const _ArgList[],const char *const _Env[]);
+  intptr_t __cdecl execvp(const char *_Filename,const char *const _ArgList[]);
+  intptr_t __cdecl execvpe(const char *_Filename,const char *const _ArgList[],const char *const _Env[]);
 #endif
-  intptr_t __cdecl spawnv(int,const char *_Filename,char *const _ArgList[]);
-  intptr_t __cdecl spawnve(int,const char *_Filename,char *const _ArgList[],char *const _Env[]);
-  intptr_t __cdecl spawnvp(int,const char *_Filename,char *const _ArgList[]);
-  intptr_t __cdecl spawnvpe(int,const char *_Filename,char *const _ArgList[],char *const _Env[]);
+  intptr_t __cdecl spawnv(int,const char *_Filename,const char *const _ArgList[]);
+  intptr_t __cdecl spawnve(int,const char *_Filename,const char *const _ArgList[],const char *const _Env[]);
+  intptr_t __cdecl spawnvp(int,const char *_Filename,const char *const _ArgList[]);
+  intptr_t __cdecl spawnvpe(int,const char *_Filename,const char *const _ArgList[],char *const _Env[]);
 #endif
 
 #ifdef __cplusplus
diff --git a/win32/include/winapi/winbase.h b/win32/include/winapi/winbase.h
index a5d9b17..4a38006 100644
--- a/win32/include/winapi/winbase.h
+++ b/win32/include/winapi/winbase.h
@@ -968,15 +968,15 @@ extern "C" {
   LONG64 InterlockedExchangeAdd64(LONG64 volatile *Addend,LONG64 Value);
   LONG64 InterlockedCompareExchange64(LONG64 volatile *Destination,LONG64 ExChange,LONG64 Comperand);
 #else
-  LONG InterlockedIncrement(LONG volatile *lpAddend);
-  LONG InterlockedDecrement(LONG volatile *lpAddend);
-  LONG InterlockedExchange(LONG volatile *Target,LONG Value);
+  LONG WINAPI InterlockedIncrement(LONG volatile *lpAddend);
+  LONG WINAPI InterlockedDecrement(LONG volatile *lpAddend);
+  LONG WINAPI InterlockedExchange(LONG volatile *Target,LONG Value);
 
 #define InterlockedExchangePointer(Target,Value) (PVOID)InterlockedExchange((PLONG)(Target),(LONG)(Value))
 
-  LONG InterlockedExchangeAdd(LONG volatile *Addend,LONG Value);
-  LONG InterlockedCompareExchange(LONG volatile *Destination,LONG Exchange,LONG Comperand);
-  LONGLONG InterlockedCompareExchange64(LONGLONG volatile *Destination,LONGLONG Exchange,LONGLONG Comperand);
+  LONG WINAPI InterlockedExchangeAdd(LONG volatile *Addend,LONG Value);
+  LONG WINAPI InterlockedCompareExchange(LONG volatile *Destination,LONG Exchange,LONG Comperand);
+  LONGLONG WINAPI InterlockedCompareExchange64(LONGLONG volatile *Destination,LONGLONG Exchange,LONGLONG Comperand);
 
   __CRT_INLINE LONGLONG InterlockedAnd64 (LONGLONG volatile *Destination,LONGLONG Value) {
     LONGLONG Old;