Sync to trunk head (r42241)

[reactos.git] / reactos / include / crt / stdlib.h

diff --git a/reactos/include/crt/stdlib.h b/reactos/include/crt/stdlib.h
index 206dd69..fbff168 100644 (file)
--- a/reactos/include/crt/stdlib.h
+++ b/reactos/include/crt/stdlib.h
@@ -152,7 +152,7 @@ extern "C" {
   _CRTIMP extern char *_sys_errlist[];
   _CRTIMP extern int _sys_nerr;
 
-#if (defined(_X86_) || defined(__x86_64)) // HACK
+//#if !defined(__x86_64)// hack here!
   _CRTIMP int *__cdecl __p___argc(void);
   _CRTIMP char ***__cdecl __p___argv(void);
   _CRTIMP wchar_t ***__cdecl __p___wargv(void);
@@ -160,7 +160,7 @@ extern "C" {
   _CRTIMP wchar_t ***__cdecl __p__wenviron(void);
   _CRTIMP char **__cdecl __p__pgmptr(void);
   _CRTIMP wchar_t **__cdecl __p__wpgmptr(void);
-#endif
+//#endif
 #ifndef __argc
 #ifdef _MSVCRT_
   extern int __argc;
@@ -305,7 +305,7 @@ extern "C" {
   _CRTIMP __declspec(noreturn) void __cdecl _exit(int _Code);
 #if !defined __NO_ISOCEXT /* extern stub in static libmingwex.a */
   /* C99 function name */
-  void __cdecl __declspec(noreturn) _Exit(int); /* Declare to get noreturn attribute.  */
+  __declspec(noreturn) void __cdecl _Exit(int); /* Declare to get noreturn attribute.  */
   __CRT_INLINE void __cdecl _Exit(int status)
   {  _exit(status); }
 #endif
@@ -313,7 +313,7 @@ extern "C" {
 #pragma push_macro("abort")
 #undef abort
 #endif
-  void __cdecl __declspec(noreturn) abort(void);
+  __declspec(noreturn) void __cdecl abort(void);
 #if __MINGW_GNUC_PREREQ(4,4)
 #pragma pop_macro("abort")
 #endif